From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 1 Aug 2014 15:07:43 +0000 (-0400)
Subject: Merge branch 'release/1.0'
X-Git-Tag: v1.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1f61e290139436d48b5dee76c544e81c4c4430b6;p=web%2FAlicesKandyKorn.git

Merge branch 'release/1.0'
---

d55f0af6d1b28b5e307500252e0c36c5d81d1630