Merge branch 'gnome-3-4'
authorStef Walter <stefw@gnome.org>
Sat, 30 Jun 2012 11:35:36 +0000 (13:35 +0200)
committerStef Walter <stefw@gnome.org>
Sat, 30 Jun 2012 11:35:36 +0000 (13:35 +0200)
commit851e183f4fd8a1c3d2f2583856e2c2a414101a22
tree6ac1fcda6a782f3422ffb6935eaa7b841008007b
parentb5ecd78ede34902779c4906ea6bf6f2cc4a33fe7
parentd1cf6d5d15e25d915a3ec37092f21e65d7b2e15c
Merge branch 'gnome-3-4'