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

[Rex Dieter]

commit d4e4f5016bba8074947c9d09e237b8cdf76cf5ee
Merge: 4238b15 a8c51a8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 15:41:33 2012 -0500

    Merge branch 'master' into f17

 libkolab.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---