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

[Robert Scheck]

commit 0c117a8621f66dc80048e404ba75fc2acdea8d6d
Merge: 9d8b046 6195f94
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 17 15:57:08 2011 +0100

    Merge remote branch 'origin/master' into el5

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