[fedora-packager/el6: 2/2] Merge branch 'master' into el6

[Nick Bebout]

commit 22c119b565300622d9136678ae708df2aa003491
Merge: 9329422 09a2fac
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Dec 3 20:05:21 2012 -0600

    Merge branch 'master' into el6

 .gitignore           |    1 +
 fedora-packager.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---