From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 7 Oct 2015 13:20:00 +0000 (-0400)
Subject: Merge branch 'release/1.2.6'
X-Git-Tag: v1.2.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=85baba3b168f288029ebaafde322b7bfb8401891;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'release/1.2.6'
---

85baba3b168f288029ebaafde322b7bfb8401891