Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 20:32:39 +0000 (16:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 20:32:39 +0000 (16:32 -0400)
Version 1.0.4


Trivial merge