From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 2 Jul 2014 21:03:34 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3cf4f82406113dea0bf772b9ffcf18e796077408;p=web%2FAppleTreeInn.git

Merge branch 'hotfix/1.0.2'
---

239bab3879d1b7caed863317abac2970caa71f81