projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
53036a5
14be1d3
)
Merge branch 'ctrl' of https://github.com/dechamps/tinc into 1.1
author
Guus Sliepen
<guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:21:01 +0000
(22:21 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:21:01 +0000
(22:21 +0200)
Trivial merge