From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 14 Dec 2015 18:55:10 +0000 (-0500)
Subject: Merge tag 'v1.2.17' into develop
X-Git-Tag: v1.2.19^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f067bb95b74ea609fe706518a6d51e6525a4194e;p=WP-Themes%2Fgilmoremuseum.git

Merge tag 'v1.2.17' into develop

merge brach with hotfix 1.2.17
---

f067bb95b74ea609fe706518a6d51e6525a4194e