Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:02 +0000 (15:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:02 +0000 (15:59 -0500)
commitc739135009f5a0800c3fff04c8ac99bc9ed817a8
tree0df454a2cf67ecbff2808aadefc46263d39a7d90
parentb1153b79ca73c6547a99a50742798970d82a87e7
parent3c122daec0013d0b96e380b8edfe4624baf50663
Merge branch 'hotfix/1.0.18'