Merge branch 'hotfix/1.0.18'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jan 2016 13:39:40 +0000 (08:39 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jan 2016 13:39:40 +0000 (08:39 -0500)
commit1949826c5a08c1f1cb6031be157b976912abdd48
tree172e40e64a620f1de80007d1e6768a828fd976f1
parent75bb315dbd5647f2b8003e0ba9e3aeab97c548f2
parent8ee717ea894900ac62f4a204951396727fb388af
Merge branch 'hotfix/1.0.18'