[empathy: 4/4] Merge branch 'gnome-3-10'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 4/4] Merge branch 'gnome-3-10'
Date: Tue, 7 Jan 2014 09:38:50 +0000 (UTC)

commit df6bd22f9a320dad25eaffa5c061921de7ee351b
Merge: 5739650 4a0d05f
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jan 7 10:38:32 2014 +0100

    Merge branch 'gnome-3-10'
    
    Conflicts:
        NEWS
        configure.ac
        help/el/el.po

---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]