From: declerambaul <fabian.kaelin@gmail.com>
Date: Sun, 29 Apr 2012 22:55:49 +0000 (-0400)
Subject: Merge branch 'develop'
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=97bbc86f688fad1b0a06b74bf9e08399e5b141a2;p=limn.git

Merge branch 'develop'
---

97bbc86f688fad1b0a06b74bf9e08399e5b141a2