Merge branch 'dbus-launch' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 19 Mar 2013 14:43:55 +0000 (10:43 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 19 Mar 2013 14:43:55 +0000 (10:43 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge