From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 16 Apr 2015 14:00:54 +0000 (-0400)
Subject: Merge tag 'v1.1.21' into develop
X-Git-Tag: v1.1.31^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1e2e5a2682d21f22e140dc5e2ed520a0c3b0d6aa;p=WP-Themes%2Fgilmoremuseum.git

Merge tag 'v1.1.21' into develop

v1.1.21
---

1e2e5a2682d21f22e140dc5e2ed520a0c3b0d6aa