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

[Jan Klepek]

commit 92518603c53eb80b1d02d480d30b281e487fc250
Merge: 0e8a48a ff1dfe8
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sun Jul 24 22:16:46 2011 +0200

    Merge branch 'master' into f14

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