Merge branch 'develop' of less.ly:kraken-ui into develop
authorDavid Schoonover <dsc@wikimedia.org>
Thu, 7 Jun 2012 05:10:06 +0000 (22:10 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Thu, 7 Jun 2012 05:10:06 +0000 (22:10 -0700)
commite09c982ea2b6a2bc5690b828847066f805e0c663
tree064f1bd677efbf661f6e19b3fefd8e3b2dbd952e
parent313dde88459e81f0d0e83eaf00ce05195dc1c19b
parentec1475c87b9724e2fa8fd5695ce02ef580cb2338
Merge branch 'develop' of less.ly:kraken-ui into develop

Conflicts:
data/graphs/test.json