projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c23e503
2e7f68a
)
Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
author
Guus Sliepen
<guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:44:38 +0000
(11:44 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:44:38 +0000
(11:44 +0000)
Trivial merge