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

[Andreas Bierfert]

commit 7fd27f478c607c4572c5da131f846830e3d42f8d
Merge: 78aa660 8fe20b6
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sat Jan 3 09:28:07 2015 +0100

    Merge branch 'master' into el6

 rxvt-unicode.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---