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

Trivial merge