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.lttlst.com:3516/?a=commitdiff_plain;h=e60e02cccbfeeb3fb18303a041d6d266a5d02ba2;p=limn.git

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

e60e02cccbfeeb3fb18303a041d6d266a5d02ba2