aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-07 17:38:32 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-07 17:38:32 +0800
commitdf6bd22f9a320dad25eaffa5c061921de7ee351b (patch)
treef61da94f8e46787532dec185e31ea2310c2ba65d
parent57396500ea506ca42677292b6ab8e0cf664e5f7f (diff)
parent4a0d05f76bb33b1a78c96333780d38b23cc74b16 (diff)
downloadgsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar
gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.gz
gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.bz2
gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.lz
gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.xz
gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.zst
gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.zip
Merge branch 'gnome-3-10'
Conflicts: NEWS configure.ac help/el/el.po
0 files changed, 0 insertions, 0 deletions