From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 29 Jan 2016 19:12:56 +0000 (-0500)
Subject: Merge tag 'v1.2.21' into develop
X-Git-Tag: v1.2.31^2~1^2~14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1a6e94a18e5c6956e3b6bffad6046c7837128622;p=WP-Themes%2Fgilmoremuseum.git

Merge tag 'v1.2.21' into develop

v1.2.21
---

1a6e94a18e5c6956e3b6bffad6046c7837128622