[libkolab/el6: 24/24] Merge branch 'master' into el6

[Jeroen van Meeuwen]

commit a3a7090ddb1ee0f733bb8107937031a7a950276c
Merge: 2f9b3e4 a8260f4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jan 9 16:54:18 2013 +0000

    Merge branch 'master' into el6

 .gitignore                                         |    4 +
 ...errorhandler.h-kolabformat-errorhandler.h.patch |   39 ++++++
 libkolab.spec                                      |  143 ++++++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 178 insertions(+), 10 deletions(-)
---