From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 14 Apr 2015 18:36:12 +0000 (-0400)
Subject: Merge tag 'v1.1.6' into develop
X-Git-Tag: v1.1.31^2~20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bf8fe4787ee1af99f51419c995ecfb8dee232bc2;p=WP-Themes%2Fgilmoremuseum.git

Merge tag 'v1.1.6' into develop

v1.1.6
---

bf8fe4787ee1af99f51419c995ecfb8dee232bc2