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

[Simone Caronni]

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

    Merge branch 'master' into el6

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