Merge branch 'pt-tls'
authorMartin Willi <martin@revosec.ch>
Thu, 14 Feb 2013 16:06:07 +0000 (17:06 +0100)
committerMartin Willi <martin@revosec.ch>
Thu, 14 Feb 2013 16:06:07 +0000 (17:06 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge