r2141 - in zope2.12/trunk (debian)

[pumazi-guest at users.alioth.debian.org]

    Date: Sunday, November 14, 2010 @ 18:30:27
  Author: pumazi-guest
Revision: 2141

Setting mergeWithUpstream property on the debian directory to enable svn-buildpackage to merge with the upstream without having to store the upstream in svn (http://debianpaket.de/svn-buildpackage/ch-import.html#s3.2).

Modified:
  zope2.12/trunk/debian/	(properties)


Property changes on: zope2.12/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1