Merge pull request #141 from hunner/release_1.2.0 1.2.0
authorAshley Penney <apenney@gmail.com>
Fri, 5 Jul 2013 17:25:57 +0000 (10:25 -0700)
committerAshley Penney <apenney@gmail.com>
Fri, 5 Jul 2013 17:25:57 +0000 (10:25 -0700)
Release 1.2.0


Trivial merge