[libical/el4: 3/3] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit e78d8acf2f58cb58381949a4b702421ca7647612
Merge: 14ca418 6195f94
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 17 15:57:28 2011 +0100

    Merge remote branch 'origin/master' into el4

 .gitignore   |    2 +-
 libical.spec |   23 ++++++++++++-----------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
---