From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 2 Jul 2015 17:42:51 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.2'
X-Git-Tag: v1.2.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a320a5378ed5235edc752970aaacc325f28b35c6;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.2'
---

20794d9978d6cd89a64021ba489177cb9347a6f2