Merge branch 'hotfix/1.6.1' v1.6.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:29:43 +0000 (14:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:29:43 +0000 (14:29 -0500)
commit5a662713a603c66fcd47b1e9c2cedf87d844b486
tree102d0adf3c8d27835387149b821876a6875217d3
parentb2a005e65770ed02d46913db78a8b45ce5730a3e
parentfae9fb114c636cc8829c69658ca4b072f25c20dc
Merge branch 'hotfix/1.6.1'