[xchm/el6: 3/3] Merge branch 'master' into el6

[wolfy]

commit 7479e3917c2b1f56a6e1dce012327bb536f1ac51
Merge: dcc09c2 78da741
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Sat Mar 23 23:37:39 2013 +0200

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 xchm.spec  |   13 +++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 05879e4,108dca2..a50fc3f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,2 @@@
 -xchm-1.17.tar.gz
 -/xchm-1.19.tar.gz
 -/xchm-1.20.tar.gz
  /xchm-1.21.tar.gz
+ /xchm-1.22.tar.gz