[empathy: 5/5] Merge branch 'gnome-3-6'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 5/5] Merge branch 'gnome-3-6'
Date: Wed, 16 Jan 2013 08:03:45 +0000 (UTC)

commit b5be743912a828d44439693a7c5da2d8fafba7ca
Merge: e08ec07 c3716f8
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Jan 16 09:03:28 2013 +0100

    Merge branch 'gnome-3-6'
    
    Conflicts:
    	NEWS
    	configure.ac

---

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