[libkolab/el6: 16/18] Merge branch 'master' into el6

[Jeroen van Meeuwen]

commit e1f7f8ae90e452dceb2227194f30f2da77405bb0
Merge: 692d991 c26a14e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jun 28 13:28:48 2012 +0100

    Merge branch 'master' into el6

 .gitignore                      |    2 +
 libkolab-0.2.0-cmake-woos.patch |   14 +++++++
 libkolab.spec                   |   75 +++++++++++++++++++++++++++++++++++++++
 sources                         |    1 +
 4 files changed, 92 insertions(+), 0 deletions(-)
---