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

[Jan Klepek]

commit efc02ccf281ea06a5aecde359a82091b4ec33bde
Merge: fbbb379 0722a74
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Tue Jan 21 19:47:59 2014 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 byobu.spec |   68 +++++++++++++++++++++++++++++++++++++++++++++++------------
 sources    |    2 +-
 3 files changed, 56 insertions(+), 15 deletions(-)
---