Merge branch 'tr-upgrade' into debian-upgrade
authorSam Hartman <hartmans@painless-security.com>
Thu, 19 Jun 2014 15:38:46 +0000 (11:38 -0400)
committerSam Hartman <hartmans@painless-security.com>
Thu, 19 Jun 2014 15:38:46 +0000 (11:38 -0400)
commit6328a74b04291f13db6b9a35162015e457b7c019
tree9f0afed97418d9a73a761a575e9f157c42b386b6
parent828db6999e4cd2775cb706d919407ce57d35087f
parent4ca09576d948b5b74d83a3d981a3b121b87bae20
Merge branch 'tr-upgrade' into debian-upgrade

Conflicts:
debian/changelog
debian/control
debian/freeradius-postgresql.postinst
src/main/version.c
debian/changelog
debian/control
debian/freeradius-mysql.postinst
src/main/version.c