From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 29 Jan 2016 19:12:49 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.21'
X-Git-Tag: v1.2.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=255b0c84d4aa3dd3e0ee7b07e2db4ddf451724be;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.21'
---

38105216edd21bc135c889dac5ea27da0e9d6ad2