From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 2 Jul 2014 20:25:54 +0000 (-0400)
Subject: Merge tag 'v1.0' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2e9c86deb3dfc06d7b4f8b40cbb70e896e2c1d01;p=web%2FAppleTreeInn.git

Merge tag 'v1.0' into develop

Version 1.0
---

2e9c86deb3dfc06d7b4f8b40cbb70e896e2c1d01