Merge branch 'release-1.0' into develop
authorJustin Wind <justin.wind@gmail.com>
Mon, 15 Oct 2012 19:12:48 +0000 (12:12 -0700)
committerJustin Wind <justin.wind@gmail.com>
Mon, 15 Oct 2012 19:12:48 +0000 (12:12 -0700)
commitb6c0b29f034340e032c3d8f9440c758461328581
tree9841b39456a309f1ad8c6f8aa6317b31766ac9e4
parent97d878a076b7a769ed3e5f65f95fa453406af63c
parent24c7e30a82a117b4a96d8e0c7b4f9afca93a7ceb
Merge branch 'release-1.0' into develop