[knights/f15: 3/3] Merge branches 'master' and 'f15' into f15

[Julian Aloofi]

commit 2bd7746e9a7e3d0ac10093c44a0f670f26073cd6
Merge: 3512f4c 53794af
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Sun Jul 3 17:58:06 2011 +0200

    Merge branches 'master' and 'f15' into f15

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