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

Merge branch 'hotfix/1.2.12'
---

a21ff59eed809e2607199c6c0d8d0715838e0e99