From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 14 Dec 2015 18:54:27 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.17'
X-Git-Tag: v1.2.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3068d18f30446cebad8388da0e02418d0b3f29c1;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.17'
---

63e5f82de4b24f6e0b14e48fe20d75d48bc3bd99