Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:24 +0000 (14:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:24 +0000 (14:56 -0400)
commit34418ab06e1bdaf47f5b4d280d294ed73f0257de
treeedd561f55305b8a6fd1ad9cb07892123fe9c977e
parent8021fb18091e1dd687603a15f7c630dd395fc69c
parente4fde860fbf59f3c82d73fc9e7dcad028c2c2218
Merge tag 'v1.0.4' into develop

v1.0.4