Merge tag 'v1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Jul 2014 21:03:47 +0000 (17:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Jul 2014 21:03:47 +0000 (17:03 -0400)
Version 1.0.2


Trivial merge