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

[epienbro]

commit b135894fd79ec745d70b9deeee3938ac7cd41508
Merge: 97ca333 aa0ac7e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Nov 11 12:37:05 2011 +0100

    Merge branch 'master' into el5

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