From: declerambaul <fabian.kaelin@gmail.com>
Date: Mon, 14 May 2012 17:54:56 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=3238886e2d128cd1bd4c4b95b893cf12f45fdae9;p=kraken-ui.git

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

3238886e2d128cd1bd4c4b95b893cf12f45fdae9