Merge branch 'hotfix/1.5.2' v1.5.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 Aug 2016 13:28:18 +0000 (09:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 Aug 2016 13:28:18 +0000 (09:28 -0400)
commit1644e138aa4099c34ea98ad7b09e6216a3f1fdac
tree692f127f58babdc18ab7a5151cf68335781d7f23
parent33e9a625fedfd0fc74455c09a4ec96f8c956c4c1
parentb289143541e0e518ef24bde2132c7b5d4cca5510
Merge branch 'hotfix/1.5.2'