Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 17 Nov 2013 15:51:54 +0000 (16:51 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 17 Nov 2013 15:51:54 +0000 (16:51 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge