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

[Jan Klepek]

commit c18d7495dced4b16286b5964c429035eb7ef65a3
Merge: eda0a7e ff1dfe8
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sun Jul 24 22:28:14 2011 +0200

    Merge branch 'master' into el6

 .gitignore              |    1 +
 byobu.spec              |   57 ++++++++++++++++++++++++-----------------------
 byobu_byobu-shell.patch |   19 +++++++++++++++
 byobu_updates.patch     |   41 +++++++++++++++++++++++++++++++++
 sources                 |    2 +-
 5 files changed, 91 insertions(+), 29 deletions(-)
---