git://developer.intra2net.com
/
libi2ncommon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a16940
2635a78
)
Merge branch 'strongswan-v4'
author
Gerd von Egidy
<gerd.von.egidy@intra2net.com>
Tue, 31 Mar 2009 08:57:15 +0000 (10:57 +0200)
committer
Gerd von Egidy
<gerd.von.egidy@intra2net.com>
Tue, 31 Mar 2009 08:57:15 +0000 (10:57 +0200)
Conflicts:
.gitignore
packages/strongswan/strongswan.spec
Trivial merge