[shellinabox/el5: 3/3] Merge branch 'master' into el5

[Simone Caronni]

commit 3bd106c13694c1e798db4711fe595f17ce2f4837
Merge: 7e7462b d6efb60
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Aug 6 09:03:05 2013 +0200

    Merge branch 'master' into el5

 shellinabox.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---