[diskimage-builder/f20: 14/14] Merge branch 'master' into f20

[slagle]

commit 40605bb6dc338627d78b2d4c84de9b17dc1ef332
Merge: 3e145d3 18be9bc
Author: James Slagle <jslagle at redhat.com>
Date:   Thu Jul 3 16:45:06 2014 -0400

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	diskimage-builder.spec
    	sources

 .gitignore             |    2 ++
 diskimage-builder.spec |   13 ++++++++++++-
 sources                |    1 +
 3 files changed, 15 insertions(+), 1 deletions(-)
---