[kanagram/f18: 7/7] Merge branch 'master' into f18

[Than Ngo]

commit b5e49bdf295f158c03070073167bfff6ef283023
Merge: bda96fc 9e85f79
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 16:04:29 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kanagram.spec
    	sources

 .gitignore    |    1 +
 kanagram.spec |   21 ++++++++++++++++++---
 sources       |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 17b758b,a7063f7..3a24c3b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kanagram-4.8.5.tar.xz
 +/kanagram-4.9.1.tar.xz
 +/kanagram-4.9.2.tar.xz
 +/kanagram-4.9.3.tar.xz
 +/kanagram-4.9.4.tar.xz
 +/kanagram-4.9.5.tar.xz
+ /kanagram-4.10.1.tar.xz