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

[wolfy]

commit b14821ebe88f86b00d46c76fbed5e8386526355c
Merge: e6e9881 d8508c1
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Mon Sep 2 11:22:06 2013 +0300

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 xchm.spec  |   16 +++++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 50d7e3f,4c939a9..b1acd78
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,6 +1,4 @@@
  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
+ /xchm-1.23.tar.gz