From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 14 Dec 2015 19:11:51 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.18'
X-Git-Tag: v1.2.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=84f53cf8126b83b2c43277c49fb121c80e846d50;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.18'
---

dce608f06815c215aa8c0df307a7a4f7e6fd4953