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

[Robert Scheck]

commit a45256914d7e28fed9c989cfe6eb9469cb7c1c74
Merge: 3276293 317dc6f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Sep 11 01:05:39 2014 +0200

    Merge remote branch 'origin/master' into el5

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