[libntlm/f19: 2/2] Merge branch 'master' into f19

[Christopher Meng]

commit 6a380ad1d2a3cb66c4e294aa14f2883b050ffbeb
Merge: de56a4b 8e87079
Author: Koji <koji at fedoraproject.org>
Date:   Mon Aug 26 11:30:09 2013 +0800

    Merge branch 'master' into f19

 libntlm.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---