Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 20:53:20 +0000 (15:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 20:53:20 +0000 (15:53 -0500)
commit1090006bd5ce3a363437d448b8341efe19397a3e
tree5d430f1c25984bf78d7a6be52942ccc844545a75
parent2b4eec3a0ce8549e58a6416fb5e2f8f7f540c474
parentb3d877684ee7f3e84e58fb2edc21e395492563ef
Merge branch 'hotfix/1.0.20'