From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 10 Apr 2015 19:47:20 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.1'
X-Git-Tag: v1.1.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b10a149a5ddb627abdb9de3487c1d50c4e56943f;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.1'
---

86d3909c56ebd7b98c702abd64f4d9d730125312