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

[wolfy]

commit e6e9881c50a72e283e22fafe487d33661b5915ac
Merge: c6fddf6 78da741
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Sat Mar 23 23:50:40 2013 +0200

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 xchm.spec  |   13 +++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index bf6f870,108dca2..50d7e3f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,3 @@@
  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