Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 14:14:09 +0000 (10:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 14:14:09 +0000 (10:14 -0400)
commit4f2555deaec31676497f0b95c6e373d8dd75a42e
tree405373580da59c1523cf9d73bfe7668742b8e791
parentc0cbced214aa12c1068f2910efdd86d2dee9ea29
parent10195159a547e1a0a0978c1b6c11f015219a5668
Merge branch 'hotfix/1.0.4'