commit 6648c9dad6fcb00d08e52bb0597da02248deb748 Merge: 96c7e57 3a66e67 Author: Jan Klepek <jan.klepek at gmail.com> Date: Sun Sep 5 18:30:10 2010 +0200 Merge branch 'master' into f13 byobu.spec | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) ---