Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Jan 2015 15:39:29 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Jan 2015 15:39:29 +0000 (10:39 -0500)
commit0187523ddd48af1653a9cf47f447bdadbbd0d969
tree79c6f90206354a5c47384298f98646448a13340c
parent49758532c4da5cee9582cf9ff0586b47474bc3b2
parent914d56648faaed86d86a90b15cfd75f5e7f56c6a
Merge branch 'hotfix/1.0.7'