Merge remote-tracking branch 'origin/gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:21:23 +0000 (13:21 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:21:23 +0000 (13:21 +0100)
commit81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a
tree858621ddfab85401af1b61bf23865b27c9d1d8a6
parent459911df1c715b033211f5358425ce3ed7be3512
parentfabe2b1b33eda5bac20e745cd0af5f96bba1b553
Merge remote-tracking branch 'origin/gnome-3-10'

Conflicts:
po/cs.po
po/es.po
po/nb.po