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

Merge branch 'hotfix/1.2.10'
---

18f0ffe58046217f1665a41cca18ead741a761b4