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

[epienbro]

commit 97ca3333dd140acda4676f72ee865f2c9bddb34a
Merge: c1bd039 94a4109
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Sep 17 15:21:45 2011 +0200

    Merge branch 'master' into el5

 .gitignore    |    1 +
 nntpgrab.spec |   41 +++++++++++++++--------------------------
 sources       |    2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)
---