Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Apr 2012 12:00:41 +0000 (14:00 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Apr 2012 12:00:41 +0000 (14:00 +0200)
commit6094f6b6b5c56f50ffa65849537b310615498c1b
tree6161fdd0320093bdbfbcb460e6eda701cf85345f
parenta26a5165bde37fad6db712cc96304c4b74ba732d
parenta04eca8be3870bf8934a8360977d2cc6d275d2d6
Merge branch 'gnome-3-4'

Conflicts:
configure.ac
po/sk.po
po/zh_CN.po