Rainer Gerhards 527822ec42 Merge branch 'v7-stable'
Conflicts:
	configure.ac
2014-02-16 11:01:38 +01:00
..
2013-10-16 13:39:35 +02:00
2014-02-16 11:01:38 +01:00