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

Merge branch 'hotfix/1.1.18'
---

3e7bd51297d13a278d7bf64e36a316ab5e2ccf1d