[nntpgrab/el6: 4/4] Merge branch 'master' into el6

[epienbro]

commit 18a2f6b64c549d25bded60edd7e1630ea956b8f4
Merge: 8613083 5d19944
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Jul 20 01:09:27 2011 +0200

    Merge branch 'master' into el6

 .gitignore    |    1 +
 nntpgrab.spec |   78 ++++++++++++++++++++++++++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 57 insertions(+), 24 deletions(-)
---