Author: preining Date: 2007-01-04 15:19:12 +0100 (Thu, 04 Jan 2007) New Revision: 2224 Modified: context-nonfree/trunk/debian/ Log: set mergeWithUpstream property [For the full diff, use svn diff.]