[libgovirt/f21: 4/4] Merge branch 'master' into f21

[Christophe Fergeau]

commit 0c7ba9ad5d0e190f53e73da0cedc3efea1ff0186
Merge: bb0c539 7926601
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Oct 9 19:09:24 2014 +0200

    Merge branch 'master' into f21

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