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

[Dennis Gilmore]

commit 67b5d86dddbf227217daf1972dbecaadcb7ac999
Merge: 22c119b eca3069
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Sun Nov 23 23:17:41 2014 -0600

    Merge branch 'master' into el6

 .gitignore           |    4 ++++
 fedora-packager.spec |   36 ++++++++++++++++++++++++++++++++++--
 sources              |    2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)
---