Merge branch 'release-1.0'
authorJustin Wind <justin.wind@gmail.com>
Wed, 12 Dec 2012 20:35:08 +0000 (12:35 -0800)
committerJustin Wind <justin.wind@gmail.com>
Wed, 12 Dec 2012 20:35:08 +0000 (12:35 -0800)
commit547de7745e81eacfc08840e538acc57c347a6985
tree6173082246fb3a18674348d284d2645855c65cbf
parentc6946ea18053aca2fea097e41b5ca78911b9d6fb
parent129284f2e355feb0c9fd20cd2d6f3259bfaa0c2d
Merge branch 'release-1.0'