Merge branch 'hotfix/1.2.15' v1.2.15
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:13 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:13 +0000 (15:25 -0500)
commite9c6a906d60b4907ec65f19ce60c18cc9c9a0196
treeb1ec5abb0ba4cea4b2093d3566c2da7f8bfab05d
parent2c9c6e7e3ef3251c51bcafcb8e52d4fe482ca7c9
parentca4e2247432cf25ba660252e4a60cbda00cd2348
Merge branch 'hotfix/1.2.15'