[nntpgrab/el5/master: 18/18] Merge branch 'master' into el5

[epienbro]

commit 834da8bebce34d847b6b8fc424cae2a6fde580c2
Merge: 1663d51 232dba3
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 21 23:37:22 2010 +0200

    Merge branch 'master' into el5

 .gitignore    |    2 +-
 nntpgrab.spec |  125 ++++++++++++++++++++++++++++++++++++++++++---------------
 sources       |    2 +-
 3 files changed, 95 insertions(+), 34 deletions(-)
---
diff --cc .gitignore
index 73be68d,d174b3b..2bc0a39
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--nntpgrab-0.6.2.tar.bz2
+ /nntpgrab-0.6.90.tar.bz2