Dan McGee 4bd52f3fe4 Merge branch 'maint' ... Remove gettext() function addition from gensync and updatesync in master as gettext is no longer used in them anyway.		2008-02-20 18:58:04 -06:00
..
pacman	Merge branch 'maint'	2008-02-20 18:58:04 -06:00
util	testdb : add conflicts checking.	2008-01-23 20:12:50 -06:00