From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 28 Aug 2015 14:36:44 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3dc265de7ca6d8e579a6a53fc6c8168ffd970bee;p=WP-Themes%2Fnorthernlakes.git

Merge branch 'hotfix/1.0.4'
---

4b7fe5199b0e3da00e0b41f18c87864c1e53aece