Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:28:27 +0000 (11:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:28:27 +0000 (11:28 -0500)
commit2aed3dd4bef2d51c94d895d08361a758e1b90481
treea9ee5e5efbdff0030a817014fc76347ec2b71f0b
parentd2bfabd3b12bdaaff7fcd0d080cd5f85546cef3d
parent73f00dd83059e47f206ca4150dd738bfbeb65321
Merge branch 'hotfix/1.0.5'