From: Justin Wind <justin.wind@gmail.com>
Date: Mon, 15 Oct 2012 19:12:48 +0000 (-0700)
Subject: Merge branch 'release-1.0' into develop
X-Git-Url: http://git.squeep.com/?p=reservoir_sample;a=commitdiff_plain;h=b6c0b29f034340e032c3d8f9440c758461328581

Merge branch 'release-1.0' into develop
---

b6c0b29f034340e032c3d8f9440c758461328581