Merge branch 'develop' of less.ly:kraken-ui into develop develop
authorDavid Schoonover <dsc@wikimedia.org>
Tue, 10 Jul 2012 11:27:30 +0000 (04:27 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Tue, 10 Jul 2012 11:27:30 +0000 (04:27 -0700)

Trivial merge