[tigase-server/f13/master: 5/5] Merge branch 'master' into f13

Matej Cepl mcepl at fedoraproject.org
Tue Oct 19 10:06:58 UTC 2010


commit 28ad5244160307de5c3b36071d4f5a01ad717795
Merge: af0537d c118d3c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Oct 19 12:06:37 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	tigase-server.spec

 tigase-server.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---


More information about the scm-commits mailing list