git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84d10b7 a43e76f)
Merge remote branch 'origin/master' into glibc-upgrade
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 15:52:27 +0000 (16:52 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 15:52:27 +0000 (16:52 +0100)
Conflicts:
packages/cyrus-imapd/cyrus-imapd.spec
packages/git/git.spec
packages/kernel-2.6/kernel-2.6.spec
sarules/configure.in


Trivial merge
libi2ncommon: Common functions used in Intra2net programs