From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 2 Jul 2014 20:25:33 +0000 (-0400)
Subject: Merge branch 'release/1.0'
X-Git-Tag: v1.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=67a3c153709fac6d4a7a6d4de4daf053335d1fb0;p=web%2FAppleTreeInn.git

Merge branch 'release/1.0'
---

67a3c153709fac6d4a7a6d4de4daf053335d1fb0