Merge branch 'hotfix/1.6.6' v1.6.6
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 17 Jan 2017 18:12:03 +0000 (13:12 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 17 Jan 2017 18:12:03 +0000 (13:12 -0500)
commit670777a1eea99167828932dda9603f4eee1a8d82
treed42446593fbb4a9edc7354c06d5dcf7cd609f176
parent2ce7a6aaa2804d79fd42ab9abf9cf4fa8ed844bd
parenta2a23eda650f92903fc0dc71d449075ec8fb44a3
Merge branch 'hotfix/1.6.6'