commit c989721c9a95fc316d38f03ed3f87548d08c31b5 Merge: 7e7462b d6efb60 Author: Simone Caronni <negativo17 at gmail.com> Date: Tue Aug 6 09:03:17 2013 +0200 Merge branch 'master' into f18 shellinabox.spec | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---