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

Merge branch 'hotfix/1.2.14'
---

2c9c6e7e3ef3251c51bcafcb8e52d4fe482ca7c9