[Collab-qa-commits] r358 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-08-06 07:56:51 +0000 (Mon, 06 Aug 2007)
New Revision: 358

Modified:
   fileconflicts/unstable-whitelist
Log:
whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-08-04 18:41:16 UTC (rev 357)
+++ fileconflicts/unstable-whitelist	2007-08-06 07:56:51 UTC (rev 358)
@@ -88,3 +88,4 @@
 python-pysqlite1.1-db:python-sqlite-dbg
 ion3-mod-xinerama:mod-xinerama-for-ion
 asterisk-sounds-extra:asterisk-sounds-main
+centericq-common:centerim-common