r115 - trunk/debian

[rousseau at alioth.debian.org]

Author: rousseau
Date: 2007-07-04 20:23:11 +0000 (Wed, 04 Jul 2007)
New Revision: 115

Modified:
   trunk/debian/
Log:
add mergeWithUpstream property



Property changes on: trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   +