Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:39:19 +0000 (11:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:39:19 +0000 (11:39 -0500)
commit9a0b5757ae14b52a35229c1a60a4ca79c41b7dee
tree4af843f6b16d2688375cdd5e7998126eaae29aa8
parentec3bc8c6e4f87195aa556539f7962e9e7dbc7328
parent3f2d8ba73e2ac187f6461d5ee248f497e49929c1
Merge branch 'hotfix/1.0.4'