[empathy: 2/2] Merge branch 'trivia'



commit f86e54b3c2ca22f3ce576233bcd78808d9107200
Merge: 7b4c1e7 e53b700
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Mon Jun 7 22:18:06 2010 +1000

    Merge branch 'trivia'

 Makefile.am |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---



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