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

[wolfy]

commit c05c36c386263614f71186354cab43aa2ee6d147
Merge: 7479e39 d8508c1
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Mon Sep 2 10:47:23 2013 +0300

    Merge branch 'master' into el6

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