]> git.meshlink.io Git - meshlink/commitdiff
projects / meshlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7966ae ad7bd09)
Merge branch 'meshlink_blacklist2'
authorGuus Sliepen <guus@meshlink.io>
Sun, 25 May 2014 18:51:02 +0000 (20:51 +0200)
committerGuus Sliepen <guus@meshlink.io>
Sun, 25 May 2014 18:51:02 +0000 (20:51 +0200)

Trivial merge
MeshLink library, based on tinc 1.1