From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 16 Apr 2015 13:57:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.20'
X-Git-Tag: v1.1.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5ab770557b84e1cf0dd6106d0b5cfbcbb3a5e3f1;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.20'
---

79b1370eaecfbeeeeccca65fb0fa5e3c1b03eb88