[byobu/f13/master: 4/4] Merge branch 'master' into f13

[Jan Klepek]

commit 21b187d9c8dcaa0bbe47513acad864fa804e3cb2
Merge: 6648c9d 66a3974
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jan 8 13:00:50 2011 +0100

    Merge branch 'master' into f13

 .gitignore         |    2 ++
 byobu-status.patch |   11 -----------
 byobu.spec         |   16 +++++++++-------
 sources            |    2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index 1cce293,55c686a..06840d3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,3 @@@
 -byobu_2.80.orig.tar.gz
  /byobu_3.4.orig.tar.gz
+ /byobu_3.20.orig.tar.gz
+ /byobu_3.21.orig.tar.gz