From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 2 Jul 2014 20:37:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: v1.0.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0ae84e9856e7554e6fd6df0664d6002d3910298b;p=web%2FAppleTreeInn.git

Merge branch 'hotfix/1.0.1'
---

b05ed0cb01952a5c2d8daaf544022bb8a4fbf61d