[mksh/el5: 3/3] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit e6c008064017248300b463206263b6d26cd2fb5e
Merge: d03ab3e b3a1ea2
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jan 14 08:25:22 2014 +0100

    Merge remote branch 'origin/master' into el5

 mksh.spec |    9 ++++++---
 sources   |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
---