Merge branch 'hotfix/1.0.20' V1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:39:33 +0000 (10:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:39:33 +0000 (10:39 -0400)
commit860f61375e182ceabe3e50bda4a3a42b83ecf626
treec52a1038a7992ec8c31c71cd455035d769f39543
parentb15645ce3447c2d79bc37fc2da80ad27308ddcda
parentb8bf404794aebb1a0a3d0d5808bf55923b1dcba9
Merge branch 'hotfix/1.0.20'