[fedup/f20: 4/4] fedup-0.9.0 (merged from 'master')

[Will Woods]

commit 6346b94d9fb1c3d138e47caf43de4e04e28d42b2
Merge: bc7685e 3fe6236
Author: Will Woods <wwoods at redhat.com>
Date:   Wed Oct 29 15:13:07 2014 -0400

    fedup-0.9.0 (merged from 'master')
    
    Conflicts:
    	.gitignore
    	fedup.spec
    	sources

 .gitignore |    1 +
 fedup.spec |   12 +++++++++++-
 sources    |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---