Merge branch 'gnome-3-4'
authorStef Walter <stefw@gnome.org>
Tue, 19 Jun 2012 10:28:30 +0000 (12:28 +0200)
committerStef Walter <stefw@gnome.org>
Tue, 19 Jun 2012 10:28:30 +0000 (12:28 +0200)
commit94ef6acff706971f0275a3cc4f560378cb0e8c97
treefc18570113ec9576286f1450d3ff8a87e7016b76
parent8f7532ef44e45ca49aaa65bc2a43524fb372ffdc
parentf7ccffe0c5cb81179d86c05caf3e83867d21a08a
Merge branch 'gnome-3-4'