[unetbootin/el6: 2/2] Merge branch 'master' into el6

[Susi Lehtola]

commit ee6e2970d6d8c54ca1adb082dd576dad48a710b2
Merge: 433b575 bdb91dd
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Apr 22 20:55:08 2014 +0300

    Merge branch 'master' into el6

 .gitignore      |    1 +
 sources         |    2 +-
 unetbootin.spec |   12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)
---