Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:44:47 +0000 (15:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:44:47 +0000 (15:44 -0400)
commitf8b794051196c4d6764e3cc90c8312db6a79ec4d
tree32a224075f94ed008fc06169836753d337fa0e6b
parent482b84abc689bb0f92cc623f8f4790427a725359
parent2faeb8b8a3769ba894da269dba1ecf105c92add2
Merge branch 'hotfix/1.0.4'