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

[epienbro]

commit b44c263256cac6097bbeea6bbd511704e9278100
Merge: 150fa3e aa0ac7e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Nov 11 12:37:31 2011 +0100

    Merge branch 'master' into el6

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