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)
commitc8c2532a9b9099070f99d2987195ed75f6736086
tree47104b6b5f7246dde38f6c3620cb1b49d017ce59
parentf8f9fcb14bad018b832a68304184f3e4a86c742d
parent84df9ea721ed6b1b354aa4e0b2b63bfd3a1e1c7e
Merge branch 'develop' of less.ly:kraken-ui into develop