Merge remote branch 'gnome/master'
commite3894e3d75bc0f4c21bd9ecf10910e0fa2a29d98
authorHolger Hans Peter Freyther <zecke@selfish.org>
Mon, 29 Mar 2010 05:33:01 +0000 (29 07:33 +0200)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Mon, 29 Mar 2010 05:33:01 +0000 (29 07:33 +0200)
tree594000f81c56ee07b7f38397df6d60ebd6924baf
parent0ddbd80b725b27e1489410626d8a8097d5448ed7
parent04380c8c329fc33d0a42da9c94d44adddbe91b19
Merge remote branch 'gnome/master'

Conflicts:
po/cs.po