From: Justin Wind <justin.wind@gmail.com>
Date: Fri, 22 Feb 2013 02:38:28 +0000 (-0800)
Subject: Merge branch 'release/release-1.2' into develop
X-Git-Url: http://git.squeep.com/?p=reservoir_sample;a=commitdiff_plain;h=16dc56664a14a91ee61fdf1a50280b6e270b66e2;hp=74d72bd7756cdb09dbbb403dfc6b390f17c2ef17

Merge branch 'release/release-1.2' into develop
---