[rxvt-unicode/el6: 8/8] Merge branch 'master' into el6

[Andreas Bierfert]

commit 78aa660fc96db2aa53e3329c7da287d869ec93cf
Merge: 7708fb9 359c1a1
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sat Jan 3 09:03:04 2015 +0100

    Merge branch 'master' into el6

 .gitignore                                         |    3 +-
 ...0001-Prefer-XDG_RUNTIME_DIR-over-the-HOME.patch |   27 ++++++++++
 rxvt-unicode-256color-ml.desktop                   |    1 +
 rxvt-unicode-256color.desktop                      |    1 +
 ...-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch |   25 ----------
 ...-9.21-Fix-hard-coded-wrong-path-to-xsubpp.patch |   12 +++++
 rxvt-unicode-ml.desktop                            |    1 +
 rxvt-unicode.desktop                               |    1 +
 rxvt-unicode.spec                                  |   51 +++++++++++--------
 sources                                            |    2 +-
 10 files changed, 74 insertions(+), 50 deletions(-)
---