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

[dmach]

commit b7619ac64432cb0521e2543210fc1c9463688e09
Merge: 88f7ecd 4be60f7
Author: Daniel Mach <dmach at redhat.com>
Date:   Tue Feb 17 15:41:04 2015 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 kobo.spec  |   13 ++++++-------
 sources    |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---