Merge branch 'hotfix/1.2' v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 18:59:59 +0000 (13:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 18:59:59 +0000 (13:59 -0500)
commitc3a721e3efd9dee9f344ff76b16f3c86f1c27aee
tree52dade0a093ca18aed87f80e3bc6af3de9c87f3d
parentfe8c3c173d9fb10827af2b398eff8703f9445a02
parentfd944bfaa8bb9f98a26ac4f36f90f374c17df343
Merge branch 'hotfix/1.2'