From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 20 Apr 2015 16:08:25 +0000 (-0400)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: v1.0.1~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fd542b744239fc289a26937676de56139f6bced7;p=WP-Themes%2FAdelaineConstruction.git

Merge branch 'release/1.0.0'

Conflicts:
	single.php
---

fd542b744239fc289a26937676de56139f6bced7