From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 18 May 2016 18:22:36 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: 1.0.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b395ff3e58a78f738d13870b49b147ea8e88be9d;p=WP-Themes%2Fcamppetosega.git

Merge branch 'hotfix/1.0.5'
---

38ae7f7e037e7a571231b737d190a79507392971