From 2d6776d79732f6771885a549de5c37f9e75f7641 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 18 Jan 2005 09:31:59 +0000
Subject: fixed merging

---
(limited to 'korganizer')

--
cgit v0.9.0.2