Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:59:05 +0000 (14:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:59:05 +0000 (14:59 -0400)
commitf2d2a48de5bc7bd9614c217a5a78e60c887d8789
tree74eeb63374cc5614c7d29cd9dff4f63a44b8f6af
parente4fde860fbf59f3c82d73fc9e7dcad028c2c2218
parentadb2e723d2ffddca97e2468b2aba91f8958327b4
Merge branch 'hotfix/1.0.5'