Author: white-guest Date: 2006-06-22 14:48:14 +0000 (Thu, 22 Jun 2006) New Revision: 399 Modified: trunk/kolabadmin/trunk/debian/ Log: * do the mergewithUpstream magic Property changes on: trunk/kolabadmin/trunk/debian ___________________________________________________________________ Name: mergeWithUpstream + 1