Merge branch 'release/release-1.2' into develop
authorJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:38:28 +0000 (18:38 -0800)
committerJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:38:28 +0000 (18:38 -0800)
commit16dc56664a14a91ee61fdf1a50280b6e270b66e2
tree85193a01d0f007654a1377ba17b3f6facfe43cc4
parentc0224807bccbd7e71e312fb4151378bff4f5a5db
parent74d72bd7756cdb09dbbb403dfc6b390f17c2ef17
Merge branch 'release/release-1.2' into develop