From: Justin Wind <justin.wind@gmail.com>
Date: Tue, 19 Feb 2013 06:35:08 +0000 (-0800)
Subject: Merge branch 'release-1.1' into develop
X-Git-Url: http://git.squeep.com/?p=reservoir_sample;a=commitdiff_plain;h=4fccfc8fc60e56a5c09648e3914250f0312a0b5b

Merge branch 'release-1.1' into develop
---

4fccfc8fc60e56a5c09648e3914250f0312a0b5b