Merge branch 'tr-integ' into debian
authorSam Hartman <hartmans@debian.org>
Wed, 17 Sep 2014 19:13:00 +0000 (15:13 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 17 Sep 2014 19:13:00 +0000 (15:13 -0400)
commitc515e5ff3added36d86661619b64a40ca73e79c3
tree0a3924096a10f9db7d5bc33b30bb95b98cde9abd
parentdd091d09b5c319276824d90a914be6ddb7d92880
parent3066e417a7965869445de2555fc141c005424a4d
Merge branch 'tr-integ' into debian

Conflicts:
debian/changelog
debian/control
debian/rules
raddb/mods-available/abfab_psk_sql
debian/changelog
debian/control
debian/rules
src/main/tls.c
src/main/version.c