Merge branch 'master' into portable

author Mark Wielaard <mjw@redhat.com>

Wed, 10 Jun 2015 15:51:09 +0000 (17:51 +0200)

committer Mark Wielaard <mjw@redhat.com>

Wed, 10 Jun 2015 15:51:09 +0000 (17:51 +0200)
author Mark Wielaard <mjw@redhat.com>
Wed, 10 Jun 2015 15:51:09 +0000 (17:51 +0200)
committer Mark Wielaard <mjw@redhat.com>
Wed, 10 Jun 2015 15:51:09 +0000 (17:51 +0200)
diff --cc ChangeLog
Simple merge
diff --cc config/ChangeLog
Simple merge
diff --cc configure.ac
Simple merge
author	Mark Wielaard <mjw@redhat.com>
	Wed, 10 Jun 2015 15:51:09 +0000 (17:51 +0200)
committer	Mark Wielaard <mjw@redhat.com>
	Wed, 10 Jun 2015 15:51:09 +0000 (17:51 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
config/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history