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

[Dan Horák]

commit 812e6af80c8bc96c91e7e60b6b959b46fb127bdb
Merge: c1dcec5 7b3f395
Author: Dan Horák <dan at danny.cz>
Date:   Mon Jan 3 16:11:28 2011 +0100

    Merge branch 'master' into el6

 .gitignore   |    1 +
 roxterm.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---