[folks: 8/8] Merge branch 'folks-0-6'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [folks: 8/8] Merge branch 'folks-0-6'
Date: Mon, 30 Apr 2012 13:26:54 +0000 (UTC)

commit 4cfb16eeb76e633aca2a5c33beb4e8b4d2f13a8f
Merge: 186a237 79f7983
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Apr 30 15:26:40 2012 +0200

    Merge branch 'folks-0-6'
    
    Conflicts:
    	NEWS
    	configure.ac

 backends/telepathy/lib/tpf-persona.vala |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)
---

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