Merge branch 'develop' of less.ly:kraken-ui into develop
authorDavid Schoonover <dsc@wikimedia.org>
Wed, 6 Jun 2012 14:12:32 +0000 (07:12 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Wed, 6 Jun 2012 14:12:32 +0000 (07:12 -0700)

Trivial merge