Merge branch 'hotfix/1.2.32' v1.2.32
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:24:13 +0000 (12:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:24:13 +0000 (12:24 -0400)
commitc8bf71df385cf9c351793b8015f94c4acbd8b057
tree3b4f3927327149d166cbb4cd0abb8950d9b3c2a0
parentd6fd0587b6bbc9a7857a97183d3e39de753dcb1a
parent9f921100d12b68a397d70d26d151940e84ec745b
Merge branch 'hotfix/1.2.32'