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

Merge tag 'v1.1.17' into develop

v1.1.17
---

79a14c41d30a589eb49f8b1037445caff3787a1e