Merge branch 'develop' of less.ly:kraken-ui into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Wed, 6 Jun 2012 14:04:10 +0000 (16:04 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Wed, 6 Jun 2012 14:04:10 +0000 (16:04 +0200)

Trivial merge