From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 19 Nov 2015 18:06:24 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.11'
X-Git-Tag: v1.2.11^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2ee589aa82a63f405670cb1f2d36de6fba2eff35;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.11'
---

2ee589aa82a63f405670cb1f2d36de6fba2eff35