From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 15 Apr 2015 16:09:41 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.14'
X-Git-Tag: v1.1.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b2fa85360d4b1af4187f6d31d2cafdb2521bd842;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.14'
---

b128958a4e0075e685a1f42e65e6925fc5ee34c0