Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 1 Dec 2013 10:40:40 +0000 (11:40 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 1 Dec 2013 10:40:40 +0000 (11:40 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge