From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 11 Dec 2015 19:52:21 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.16'
X-Git-Tag: v1.2.16
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3b469e26252358f528a66814d6c658b0a48e0664;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.16'
---

4552ed8af567f35a69356eabaa1b228c150020d8