Merge branch 'hotfix/1.6.2' v1.6.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 17:37:34 +0000 (12:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 17:37:34 +0000 (12:37 -0500)
commitc0d5f1d32547f67960aa0f76dae347b230ecd1bf
tree35e1495721e5a33824029a072eb7893d4092a676
parent94b6a018bf02b678ebe39289698301aca5c0d928
parentc11c00cc9b08a19a924728cf62af23d7c4ebbdef
Merge branch 'hotfix/1.6.2'