From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 6 May 2016 12:22:10 +0000 (-0400)
Subject: :Merge branch 'hotfix/1.0.4'
X-Git-Tag: 1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=893a6414dbdaf69cab130f1a64660b204c9e2e55;p=WP-Themes%2Fpicturedrocksinn.git

:Merge branch 'hotfix/1.0.4'
---

893a6414dbdaf69cab130f1a64660b204c9e2e55