[fedup/f20: 6/6] Merge branch 'master' into f20

[Adam Williamson]

commit d8ac84526162aeb9b375d57c5a50b743ea91af73
Merge: 53b4d2a fc9711f
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Feb 28 14:08:56 2014 -0800

    Merge branch 'master' into f20
    
    Conflicts:
    	fedup.spec

 .gitignore                                         |    1 +
 ...-startup-when-packagedir-isn-t-on-root-10.patch |   32 +++++++++++++++++
 ...-VERSION-if-etc-debian_release-exists-105.patch |   33 ++++++++++++++++++
 ...n-the-user-if-upgrade-contains-no-kernels.patch |   36 ++++++++++++++++++++
 fedup.spec                                         |   18 ++++++++--
 5 files changed, 117 insertions(+), 3 deletions(-)
---
diff --cc fedup.spec
index 823bfc6,b6ff8b9..1107b41
--- a/fedup.spec
+++ b/fedup.spec
@@@ -1,6 -1,6 +1,7 @@@
  Name:           fedup
  Version:        0.8.0
 +Release:        3%{?dist}
+ Release:        4%{?dist}
  Summary:        The Fedora Upgrade tool
  
  License:        GPLv2+