Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:41:18 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:41:18 +0000 (16:41 -0500)
commit6250146b2514d019b932a31151be11a7d3f9ad10
treeeb844a5d21c1872baaa08d2929ea313cc0b4629d
parenta34b0077d87dd515e3bd67fefc9127fb6b0d3b32
parentecd8807d78e94b0c7ca2429a6bcf2254face4789
Merge branch 'hotfix/1.0.2'