Merge branch 'gnome-3-6'
authorStef Walter <stefw@gnome.org>
Mon, 22 Oct 2012 14:18:37 +0000 (16:18 +0200)
committerStef Walter <stefw@gnome.org>
Mon, 22 Oct 2012 14:18:37 +0000 (16:18 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge