Merge branch 'hotfix/1.1.7' v1.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Sep 2014 13:07:00 +0000 (09:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Sep 2014 13:07:00 +0000 (09:07 -0400)
commitc3d5e97dd85727888f84538cc2e0b48a96d391bc
tree79fd7999488b207e6ee4bf1d03b71ef11a693eb0
parent3b3fff3c6797bf6d5fb2f7d812650b768990d49d
parentcdb90e3df62d60914bbbba4599e24495c3751883
Merge branch 'hotfix/1.1.7'