Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jan 2015 18:35:27 +0000 (13:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jan 2015 18:35:27 +0000 (13:35 -0500)
commitde5872329a2d072b0cab9fa34908165ab2e59163
treedf76d4c045a85c9ab661ab8d7bea6e22abc98e46
parentc3d5e97dd85727888f84538cc2e0b48a96d391bc
parentd32f5fa2b16afaefe8448f22b32bec166911dfa4
Merge branch 'hotfix/1.1.8'