[roxterm/epel7: 3/4] Merge branch 'master' into f20

[Christopher Meng]

commit 97df6fefc212f4d1bf66fa0975e8842811541f3e
Merge: 62327fd 4afe536
Author: Christopher Meng <i at cicku.me>
Date:   Mon Feb 16 18:19:25 2015 +0800

    Merge branch 'master' into f20

 .gitignore   |    1 +
 roxterm.spec |   24 +++++++++++-------------
 sources      |    2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)
---