Merge tag 'v1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:24:59 +0000 (13:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:24:59 +0000 (13:24 -0400)
Version 1.0.2


Trivial merge