From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 9 Mar 2016 18:43:25 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.24'
X-Git-Tag: v1.2.24
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c12fa4c558af80e8bb87e282bab88efa7e4f87b2;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.24'
---

e896946fbf540eb5250ac46eaedfa3e4bb60710f