[dropbear/f20: 3/3] Merge branch 'master' into f20

[Christopher Meng]

commit 40b9fe2506102d5f9cc08b2e8068dbd6e3bd91dc
Merge: 3387e68 bdf720a
Author: Christopher Meng <i at cicku.me>
Date:   Sat Aug 9 09:04:34 2014 +0800

    Merge branch 'master' into f20

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