From b4d85da57e2d558ec088af6f3b2a34b1854462c0 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Thu, 07 Jul 2005 04:18:11 +0000
Subject: conflict

---
(limited to 'korganizer.control')

--
cgit v0.9.0.2