[springlobby/f13/master: 10/10] resolve merge conflict

[Aurelien Bompard]

commit f6fd274bd400d76f9a1944a0e400d54e854c33ad
Merge: 21a8db7 f4151ec
Author: Aurelien Bompard <abompard at fedoraproject.org>
Date:   Mon Aug 16 22:12:49 2010 +0200

    resolve merge conflict

 .gitignore       |    2 +-
 sources          |    2 +-
 springlobby.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 2d08f05,d741cc5..f4f142a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--springlobby-0.80.tar.bz2
+ springlobby-0.95.tar.bz2