Merge branch 'stable'

author Stef Walter <stef@thewalter.net>

Mon, 17 Jun 2013 19:57:25 +0000 (21:57 +0200)

committer Stef Walter <stef@thewalter.net>

Mon, 17 Jun 2013 19:57:25 +0000 (21:57 +0200)
author Stef Walter <stef@thewalter.net>
Mon, 17 Jun 2013 19:57:25 +0000 (21:57 +0200)
committer Stef Walter <stef@thewalter.net>
Mon, 17 Jun 2013 19:57:25 +0000 (21:57 +0200)
diff --cc configure.ac
Simple merge
diff --cc tools/Makefile.am
Simple merge
diff --cc trust/Makefile.am
Simple merge
author	Stef Walter <stef@thewalter.net>
	Mon, 17 Jun 2013 19:57:25 +0000 (21:57 +0200)
committer	Stef Walter <stef@thewalter.net>
	Mon, 17 Jun 2013 19:57:25 +0000 (21:57 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
tools/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
trust/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history