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

[Simone Caronni]

commit 0c99cf561497d7b2091f10862eae2369909bb214
Merge: 881b8d3 425ae02
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 11 11:43:24 2014 +0200

    Merge branch 'master' into el6

 shellinabox-ssh-options.patch |   11 +++++++++++
 shellinabox.spec              |   10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---