From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 2 Feb 2017 15:10:52 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.5'
X-Git-Tag: v1.1.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=20fbbbbabc02bf81b77a9789d8d141c59e5992bc;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.1.5'
---

20fbbbbabc02bf81b77a9789d8d141c59e5992bc