From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 29 Oct 2015 13:35:54 +0000 (-0400)
Subject: Merge tag 'v1.0.5' into develop
X-Git-Tag: v1.0.11^2~9
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4993527db8e5316852610f076b3a19909047b638;p=web%2FCedarvilleMarine.git

Merge tag 'v1.0.5' into develop

v1.0.5
---

4993527db8e5316852610f076b3a19909047b638