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

[Luke Macken]

commit 652c4af01e25ba23f5077380cb6cafa49f6bc060
Merge: 3ec7f5d 283ccc6
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Dec 12 14:11:13 2014 -0700

    Merge branch 'master' into el6

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