[byobu/el5: 8/8] Merge branch 'master' into el5

[Jan Klepek]

commit 2e6df3f236a65be2074ae823877967974042a155
Merge: 3b2b118 54f529f
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Aug 25 17:05:15 2012 +0200

    Merge branch 'master' into el5

 .gitignore |    2 ++
 byobu.spec |   44 ++++++++++++++++++++++++++++++--------------
 sources    |    2 +-
 3 files changed, 33 insertions(+), 15 deletions(-)
---