[libkgapi/f18: 3/3] Merge branch 'master' into f18

[Daniel Vrátil]

commit 25361f5a89eccbfb19c56ffe25feba532e3972d6
Merge: 7b83de0 ed7e481
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Dec 5 10:10:46 2013 +0100

    Merge branch 'master' into f18

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