From: Ove Klykken <ove@gaslightmedia.com>
Date: Tue, 29 Jul 2014 16:27:29 +0000 (-0400)
Subject: Merge branch 'release/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3731de7192c768fb8d77c65c79b02f3af2195ccd;p=web%2FBigFore.git

Merge branch 'release/1.0.4'
---

3731de7192c768fb8d77c65c79b02f3af2195ccd