From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 16 Apr 2015 13:39:24 +0000 (-0400)
Subject: Merge tag 'v1.1.18' into develop
X-Git-Tag: v1.1.31^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=21409e790f888e056906372dd6077fbb4ab214ff;p=WP-Themes%2Fgilmoremuseum.git

Merge tag 'v1.1.18' into develop

v1.1.18
---

21409e790f888e056906372dd6077fbb4ab214ff