Merge branch 'master' of less.ly:kraken-ui
authorDiederik <dvanliere@wikimedia.org>
Wed, 29 Feb 2012 03:06:37 +0000 (22:06 -0500)
committerDiederik <dvanliere@wikimedia.org>
Wed, 29 Feb 2012 03:06:37 +0000 (22:06 -0500)

Trivial merge