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

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

f05189d6ab202c40868222514f232eac148def5a