From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 16 Apr 2015 14:00:48 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.21'
X-Git-Tag: v1.1.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fe7171d9f71867b32e4ada2c902c7f1c85f55f08;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.21'
---

c97828ccd98dc548e62443534a72a75332a58851