[dropbear/el6: 5/7] Merge branch 'master' into epel7

[Christopher Meng]

commit 56c39c3a27a02e08d0b7b300408c6948feae0df3
Merge: fdb7dc3 7be9258
Author: Christopher Meng <i at cicku.me>
Date:   Mon Feb 9 11:29:37 2015 +0800

    Merge branch 'master' into epel7

 .gitignore    |    1 +
 dropbear.spec |   15 +++++++++++----
 sources       |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---