Merge branch 'release/1.6.40' v1.6.40
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:40:16 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:40:16 +0000 (11:40 -0400)
commit620ab69fd9cdab17f8a0118fe2a14dd416b99292
tree9dcfa486f89b8c0c04b819eb39ae3df4f71bf261
parentfd6143b4c082a47bd8798920f974f30d403f6f64
parentd67d24d7480805ddc1de5f801d9d20d0ec5f173c
Merge branch 'release/1.6.40'