git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c9f429 7ac95d8)
Merge branch 'master' into vpn-nat
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 7 Oct 2010 15:25:42 +0000 (17:25 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 7 Oct 2010 15:25:42 +0000 (17:25 +0200)
Conflicts:
packages/iptables/iptables.spec
packages/strongswan/strongswan.spec
update_cnf/src/Makefile.am


Trivial merge
libi2ncommon: Common functions used in Intra2net programs