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

[Jan Klepek]

commit 1e71626d398a3acbb6fa5f0b89c37d56975b18c1
Merge: 88392bd af907d0
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Oct 15 11:22:34 2011 +0200

    Merge branch 'master' into f14

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