Author: petere Date: 2008-04-26 13:32:01 +0000 (Sat, 26 Apr 2008) New Revision: 823 Modified: kolabconf/trunk/debian/ Log: set mergeWithUpstream Property changes on: kolabconf/trunk/debian ___________________________________________________________________ Name: mergeWithUpstream + 1