From: declerambaul <fabian.kaelin@gmail.com>
Date: Wed, 29 Feb 2012 14:45:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=ea247f5443e9cdabe55a37d78118ecf16e0df1d4;p=kraken-ui.git

Merge remote-tracking branch 'origin/master'
---

ea247f5443e9cdabe55a37d78118ecf16e0df1d4