Merge branch 'hotfix/1.1.5' V1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:24:48 +0000 (17:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:24:48 +0000 (17:24 -0500)
commitfe766cb35bb458bd8f377e83a6b0533c1263dca5
treeeb50f6073d6b973d340e2e1617256731704b2101
parentb2eec807bc73d63d4bf0a3c8d1e0f1f9ef60f180
parent28e9a9f7ddde1c2b7f3f3ce27fe56b5e7a4cbf2e
Merge branch 'hotfix/1.1.5'