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

[Dennis Gilmore]

commit 4e4a04dd32283ac9ec575b37dcf955e5edd3e43f
Merge: 67b5d86 7ff5e49
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Sun Nov 23 23:41:00 2014 -0600

    Merge branch 'master' into el6

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---