From: declerambaul <fabian.kaelin@gmail.com>
Date: Wed, 6 Jun 2012 15:02:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=51daa2aa8bcc12d4bcffd5ccad61d8851008ed3a;p=kraken-ui.git

Merge remote-tracking branch 'origin/develop' into develop
---

51daa2aa8bcc12d4bcffd5ccad61d8851008ed3a