Merge tag '1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:53 +0000 (15:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:53 +0000 (15:52 -0400)
commit5c16710cd4c7d9f59e230391fa9df9e1ec2dc457
tree86515c8bb14ab6ac85d377f3122f0b751a14c9cc
parent8dabc20083ef587984571e06886a3271cbcee407
parentf3aa818666bf9c1d163ef490197a0addffbd18a5
Merge tag '1.0.4' into develop

version 1.0.4