Merge branch 'hotfix/1.0.38'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 16:01:35 +0000 (12:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 16:01:35 +0000 (12:01 -0400)
commitfb00c214f946136486296b563c5288db1e98d9e6
tree960ff7a3b531f1caf6ded9058ee90f12baa1cf94
parentb50740632814d0de04bdf79276314c7b7baa55e8
parentbdd0975e713123bc38c0493d0acda23074c4d0df
Merge branch 'hotfix/1.0.38'