[suil/f17: 6/6] New upstream 0.6.10

[Brendan Jones]

commit 3413083501c9f278bb832cbaceb24c27a13ef69b
Merge: fb139a6 f865a7a
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sun Jan 13 21:30:41 2013 +0100

    New upstream 0.6.10

 .gitignore |    6 ++++++
 sources    |    4 ++++
 suil.spec  |    5 ++++-
 3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index dd5ef4a,fbd6cc7..0220e22
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,8 @@@
++<<<<<<< HEAD
 +/suil-0.4.4.tar.bz2
 +/suil-0.6.6.tar.bz2
++=======
+ /suil-0.6.0.tar.bz2
+ /suil-0.6.6.tar.bz2
+ /suil-0.6.10.tar.bz2
++>>>>>>> master
diff --cc sources
index a24cd62,c2a10f9..6bf981a
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +6b596ad806b7bf34dfba34afb48bb758  suil-0.6.6.tar.bz2
++=======
+ 735e3cc4d539059cf3948d3dba75807e  suil-0.6.10.tar.bz2
++>>>>>>> master