Merge tag 'v1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:17:24 +0000 (11:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:17:24 +0000 (11:17 -0400)
Version 1.0


Trivial merge