git://developer.intra2net.com
/
libi2ncommon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
316e99a
bfa0459
)
Merge remote branch 'origin/glibc-upgrade' into amavisd-update
author
Gerd von Egidy
<gerd.von.egidy@intra2net.com>
Thu, 14 Jan 2010 11:10:19 +0000 (12:10 +0100)
committer
Gerd von Egidy
<gerd.von.egidy@intra2net.com>
Thu, 14 Jan 2010 11:10:19 +0000 (12:10 +0100)
Conflicts:
packages/amavisd-new/amavisd-new.spec
Trivial merge