Author: pabs Date: 2010-10-30 11:48:42 +0000 (Sat, 30 Oct 2010) New Revision: 11442 Modified: packages/trunk/between/debian/ Log: Set upstream merge mode Property changes on: packages/trunk/between/debian ___________________________________________________________________ Added: mergeWithUpstream + 1