From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 14 Apr 2015 21:01:58 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.12'
X-Git-Tag: v1.1.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ccfc2af8bab65902cf3652374f10c48c2edac0a0;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.12'
---

9a71adaff616497c3ff1824ae1d4a363f94b6d16