Rainer Gerhards 8fae8b6d86 Merge branch 'v2-stable' into v3-stable
Conflicts:

	doc/Makefile.am
	doc/manual.html
2008-04-11 10:49:02 +02:00
..
2008-02-25 14:47:33 +00:00
2008-02-28 11:14:58 +00:00
2008-02-28 11:18:59 +00:00
2008-01-28 16:29:08 +00:00
2008-01-18 14:45:11 +00:00
2008-03-28 11:18:42 +00:00
2008-04-04 09:48:30 +00:00