Merge branch 'master' of black:tinc
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 18 Feb 2012 10:43:00 +0000 (11:43 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 18 Feb 2012 10:43:00 +0000 (11:43 +0100)
commit1b2846d907adfc8472fc9da0c951c3243c7ee143
tree09cfd9e6f5d5bd906ef0311ea7dcd2a85a494af5
parent9f6a96af3939bd2de410ce346a8c8fbcf93e7c9b
parent6455654d26d204cea4bbc102e5bd6550b7fff7a7
Merge branch 'master' of black:tinc