Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 26 Nov 2013 13:07:22 +0000 (08:07 -0500)
committerSam Hartman <hartmans@debian.org>
Tue, 26 Nov 2013 13:07:22 +0000 (08:07 -0500)
commita353199874aea40ac976b9f31ef415a8af021dca
tree6cabbefb24991c21445be108aca767e0554fb825
parent309a35211240fcc0a189f9e044aab2cca2881ff9
parent4bdf75e888efc2ae983e8eb1d53f2e5a78023add
Merge branch 'master' into debian

Pull in change to ignore TLS errors