From: declerambaul <fabian.kaelin@gmail.com>
Date: Thu, 7 Jun 2012 13:51:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Url: http://git.lttlst.com:3516/?a=commitdiff_plain;h=db2e782e68a7277f7929433d39bd8995b7133bb0;p=kraken-ui.git

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

db2e782e68a7277f7929433d39bd8995b7133bb0