Merge branch 'hotfix/1.0.17'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:35:39 +0000 (17:35 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:35:39 +0000 (17:35 -0500)
commit75bb315dbd5647f2b8003e0ba9e3aeab97c548f2
tree35ea00e3b3c7841b8fabd1906fc81a08403ee5b9
parent58b6d210c8985b3c5b87ef058288c4d2cb46d172
parent730b9104938daed85a01c8a6bccaddf5a2ed6616
Merge branch 'hotfix/1.0.17'