Merge branch 'hotfix/1.1.15'
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 13:12:31 +0000 (08:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 13:12:31 +0000 (08:12 -0500)
commit5b545692310fcbe4b2f3d7cfc42d6a4967e17e0f
treec91c0075ae257e2be98adc6c0fca02742f9c2744
parent6872f2a953be4dff59c4c0f64331a9b2d5d07812
parenta44918a60a0e0c735f2d178b5b99b6b10df1ea48
Merge branch 'hotfix/1.1.15'