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

[Robert Scheck]

commit 32762936994ea18cf4b19fb89d4869b36a51e7ef
Merge: e6c0080 a2e7a9c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 3 21:30:50 2014 +0200

    Merge remote branch 'origin/master' into el5

 mksh.spec |    8 +++++++-
 sources   |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
---