Author: nomeata Date: 2011-10-26 17:23:16 +0000 (Wed, 26 Oct 2011) New Revision: 12712 Modified: packages/trunk/nikki/debian/ Log: Set mergeWithUpstream for nikki repo Property changes on: packages/trunk/nikki/debian ___________________________________________________________________ Added: mergeWithUpstream + 1