Merge branch 'hotfix/1.2.31' v1.2.31
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:10:07 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:10:07 +0000 (12:10 -0400)
commitd6fd0587b6bbc9a7857a97183d3e39de753dcb1a
treefd9be83e1fd13d6f533caddd663e158ee4fbdbcc
parent0d148117b4d5010b5a2da81c000f0f5524151dc3
parent672764e60d75493eb1c5b4bc53571bdf13645007
Merge branch 'hotfix/1.2.31'