Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:42 +0000 (14:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:42 +0000 (14:29 -0400)
commitbb7b7571d46e6ee51d59a358b13dec8e9268e1b4
treef75035b9da7d8d760c032f1d4946253c8ba57a8c
parent24274e8311970be78476479e5dea9da9adb180f7
parentbc7cfc92736f44b02d1a3c40bd124053d861309c
Merge tag 'v1.0.25' into develop

v1.0.25