[libkolab/f17: 18/18] Merge branch 'master' into f17

[Jeroen van Meeuwen]

commit b47fd21ec228db935efad12add569e31ae5ee736
Merge: de689a0 18ed345
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jun 28 13:29:42 2012 +0100

    Merge branch 'master' into f17

 libkolab-0.2.0-cmake-woos.patch |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
---