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

[Jan Klepek]

commit b3beae1fc3608e89dcd8ae08d0ab934c63c7f598
Merge: d125a10 12d0732
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Fri Feb 28 18:54:10 2014 +0100

    Merge branch 'master' into el6

 byobu-5.73-config_except.patch |   21 +++++++++++++++++++++
 byobu.spec                     |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---