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

[Jamie Nguyen]

commit 7708fb99f32d79fbbfcde321629cc6d80f06d4e6
Merge: 1acbd82 848abd4
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue May 13 19:41:11 2014 +0100

    Merge branch 'master' into el6

 ...-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch |   25 ++++++++++++++++++++
 rxvt-unicode-scroll-modupdown.patch                |   14 -----------
 rxvt-unicode-tabbed-newterm.patch                  |   14 -----------
 rxvt-unicode-xsubpp.patch                          |   11 --------
 rxvt-unicode.spec                                  |   22 +++++++++--------
 5 files changed, 37 insertions(+), 49 deletions(-)
---