From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 16 Apr 2015 13:35:00 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.17'
X-Git-Tag: v1.1.17^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=234577db3703f8e4b10fe8c4d481049a8b54e1a9;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.17'
---

234577db3703f8e4b10fe8c4d481049a8b54e1a9