Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:19:14 +0000 (17:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:19:14 +0000 (17:19 -0500)
commit1db42898abe3667776d7d0af30026210d49dd128
tree9e3a3b1078f933aeffa3ca54e2e85448cd0c788a
parent3707972d0307f7765b520d5b055ad2f41fbf616f
parent3f79a9d336277125b79ebf2e1b2bfe8f37acf729
Merge branch 'hotfix/1.0.5'