Merge branch 'hotfix/1.2.15'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:10:30 +0000 (13:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:10:30 +0000 (13:10 -0500)
commit13575831b87e1ac42b163afc65409ddcf445a2e7
tree5773c3d770e2956c05b09c835a186e4e394e772f
parentffd3c2f7362b5346c9623f243a691fa76f76a741
parent95b37f18698b4b58c94d4968557af9c696c4e95d
Merge branch 'hotfix/1.2.15'