From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 29 Oct 2015 13:35:50 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=852428375e386eb4969a2c928e3f01b913fe19de;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.5'
---

852428375e386eb4969a2c928e3f01b913fe19de