[empathy: 2/2] Merge remote branch 'smcv/conference'



commit 645f4763739a3fa2fbfade2bce5a382e1e6b4a3e
Merge: 9ea4b77 94ab9ff
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Sep 14 11:28:41 2010 +0200

    Merge remote branch 'smcv/conference'

 data/Empathy.Auth.client |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---



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