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)
Pull in change to ignore TLS errors


Trivial merge