Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:21:22 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:21:22 +0000 (11:21 -0500)
commitd2bfabd3b12bdaaff7fcd0d080cd5f85546cef3d
tree2b68a8f7e04fdd2fe8d784aa8fe17d818c0efcc6
parent683c091cda04651b24674c67cf174350d787cfb1
parent797362fb942126b170e1405ee096e969d47c2198
Merge branch 'hotfix/1.0.4'