- Merge 3.4

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

Thu, 17 Apr 2014 18:14:29 +0000 (20:14 +0200)

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

Thu, 17 Apr 2014 18:14:29 +0000 (20:14 +0200)
author doko@ubuntu.com <doko@ubuntu.com>
Thu, 17 Apr 2014 18:14:29 +0000 (20:14 +0200)
committer doko@ubuntu.com <doko@ubuntu.com>
Thu, 17 Apr 2014 18:14:29 +0000 (20:14 +0200)
diff --cc Misc/NEWS
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	doko@ubuntu.com <doko@ubuntu.com>
	Thu, 17 Apr 2014 18:14:29 +0000 (20:14 +0200)
committer	doko@ubuntu.com <doko@ubuntu.com>
	Thu, 17 Apr 2014 18:14:29 +0000 (20:14 +0200)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history