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

[Jan Klepek]

commit 2f9a9eede98027943dc5377ecf50edc6facf41f9
Merge: 7eae2a3 54f529f
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Aug 25 18:04:15 2012 +0200

    Merge branch 'master' into el6

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