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

[dmach]

commit 8db472b42609edae76295ae2dedd6e0a3f90d08f
Merge: d4f19f9 e64ce29
Author: Daniel Mach <dmach at redhat.com>
Date:   Fri Jan 17 13:32:13 2014 +0100

    Merge branch 'master' into el6

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