From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 6 Apr 2016 14:15:17 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: 1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9d05744d2d933b08ff7a320053f9bbd84692dba3;p=WP-Themes%2Fbpla.git

Merge branch 'hotfix/1.0.12'
---

7db033e666360e8e0262889cc1bee3eba7801b03