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)
Conflicts:
data/graphs/test.json


Trivial merge