]> git.meshlink.io Git - meshlink/commit
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 24 Jun 2011 19:40:55 +0000 (21:40 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 24 Jun 2011 19:40:55 +0000 (21:40 +0200)
commit79e9a4f743b7b59fed968575f6b36171cf4a0063
tree5436fa447deafd3c231aa0e86f7422f0c10f14d7
parentfb5b260190b1c6d07ec822154094aee7416f292e
parent05260f941c2a24eb3f09070a2550cf15e431266a
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
NEWS
README
configure.in
src/Makefile.am
NEWS
README.git
src/Makefile.am