From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 7 Jul 2014 17:53:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.3'
X-Git-Tag: v1.0.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c31a8def34b057807971f9c923b72b1ce4938b43;p=web%2FAppleTreeInn.git

Merge branch 'hotfix/1.0.3'
---

c31a8def34b057807971f9c923b72b1ce4938b43