Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 20:32:30 +0000 (16:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 20:32:30 +0000 (16:32 -0400)
commit9196c24996b0c92d668c21ae0a3edcdbc9b3e04b
tree5645a8a3e4a1c56bcd589d2d965261f3d54930e3
parentad296712f1ffea5366de59b06f22e95bed470992
parent7ee0bbd486e261294e57b8695ccc5c676f985ad2
Merge branch 'hotfix/1.0.4'