[liveusb-creator/el6: 6/6] Merge branch 'master' into el6

[Luke Macken]

commit 73302e5eb2e6ef74673571fa74d7258cf01c3b0c
Merge: 2c9780a 16242ab
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 26 16:05:52 2014 -0700

    Merge branch 'master' into el6

 .gitignore           |    1 +
 liveusb-creator.spec |   12 +++++++++---
 sources              |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---