Merge tag 'v1.0.4' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:08:43 +0000 (15:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:08:43 +0000 (15:08 -0400)
added more email style


Trivial merge