Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Feb 2016 17:02:44 +0000 (12:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Feb 2016 17:02:44 +0000 (12:02 -0500)
commitc69773462511c14f3da213523384ed99d48df8c1
treef5ccb47523a3ab5fea5d7d0107a48ef3d81e6ed1
parent7ae7dd391f19a5e90d607e49d60b3ed703d269d7
parent10484d035ad240e5067fd678307e462b26b910ff
Merge branch 'hotfix/1.0.20'