From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 19 May 2016 14:49:09 +0000 (-0400)
Subject: Merge tag 'v1.2.25' into develop
X-Git-Tag: v1.2.31^2~1^2~10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5f3ca47670fb9d107d1c901dbf6ca8f2f5c0b2ab;p=WP-Themes%2Fgilmoremuseum.git

Merge tag 'v1.2.25' into develop

version 1.2.25
---

5f3ca47670fb9d107d1c901dbf6ca8f2f5c0b2ab