Merge branch 'hotfix/1.0.42' v1.0.42
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 3 Nov 2015 14:07:14 +0000 (09:07 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 3 Nov 2015 14:07:14 +0000 (09:07 -0500)
commit433619063360ffa99a55987cd1778913165327ba
tree1bab39ce6a6b2103f43df0ea44c5f76d1b95c48c
parent693d0fa1fcacba4396f742a29178785ebd6cabc7
parent5f558992604820a3bd8642aea04be45b0a7b320a
Merge branch 'hotfix/1.0.42'