- merge 3.4

author doko@ubuntu.com <doko@ubuntu.com>

Mon, 13 Apr 2015 20:00:30 +0000 (22:00 +0200)

committer doko@ubuntu.com <doko@ubuntu.com>

Mon, 13 Apr 2015 20:00:30 +0000 (22:00 +0200)
author doko@ubuntu.com <doko@ubuntu.com>
Mon, 13 Apr 2015 20:00:30 +0000 (22:00 +0200)
committer doko@ubuntu.com <doko@ubuntu.com>
Mon, 13 Apr 2015 20:00:30 +0000 (22:00 +0200)
diff --cc Makefile.pre.in
Simple merge
diff --cc Modules/Setup.dist
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	doko@ubuntu.com <doko@ubuntu.com>
	Mon, 13 Apr 2015 20:00:30 +0000 (22:00 +0200)
committer	doko@ubuntu.com <doko@ubuntu.com>
	Mon, 13 Apr 2015 20:00:30 +0000 (22:00 +0200)
		1	2
Makefile.pre.in	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/Setup.dist	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history