From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 29 Jan 2016 17:16:05 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.20'
X-Git-Tag: v1.2.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=71fb5b5f5e54acae833f1a9c7ce51e62e2540b06;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.20'
---

24a3394e625940d7d4426c0f6798f29cfb948fb3