Merge branch 'hotfix/1.6.9' v1.6.9
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:56:46 +0000 (14:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:56:46 +0000 (14:56 -0500)
commit982528b7e547afcc58f04c2544544ebd35f1042d
tree415208cafc8c87d67acf88679c6a189676e0378a
parenteb10ad1bc2c18adf5f70afc036b29cf08c0b1afe
parent70aad0b6972eeda3bc7a799300d7adeff2445c7c
Merge branch 'hotfix/1.6.9'