Merge branch 'develop' of less.ly:kraken-ui into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 16:49:17 +0000 (18:49 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 16:49:17 +0000 (18:49 +0200)

Trivial merge