diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-01-07 21:08:27 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-01-07 21:08:27 +0800 |
commit | 31ec75a03a132770268cf02d98f2b477747bb54f (patch) | |
tree | b05a4f30c3ff3bda1bc4f9ee9c6170136a0f4189 /AUTHORS | |
parent | 16973fd1a14657eebf1cb39dd3f912db59a2fa77 (diff) | |
parent | 1e7449f5a14e2f031389808206c9991f65d3ade7 (diff) | |
download | gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.tar gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.tar.gz gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.tar.bz2 gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.tar.lz gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.tar.xz gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.tar.zst gsoc2013-empathy-31ec75a03a132770268cf02d98f2b477747bb54f.zip |
Merge branch 'gnome-3-6'
Conflicts:
po/kn.po
po/ta.po
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions