Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:19:46 +0000 (12:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:19:46 +0000 (12:19 -0400)
commit048b75132158424aec0f1193a037599da0d05003
tree318ef2ca9f883b0425b4aa9b209d1facbde711a5
parent8999915262188e762cf9a4b06b66fc39150a72ab
parenta6e996250841947387447ce87730306705530053
Merge branch 'hotfix/1.0.6'