Author: preining Date: 2011-06-27 14:17:33 +0000 (Mon, 27 Jun 2011) New Revision: 4877 Modified: context-modules/trunk/debian/ Log: setting mergeWithUpstream on debian dir for svn-buildpackage [For the full diff, use svn diff.]