[sword/f20: 5/5] Merge remote-tracking branch 'origin/master' into f20

[Greg Hellings]

commit 66d4861a9541af743af38b7a6f6c17a15c951b3e
Merge: b2b9585 85db7ef
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Wed Aug 27 20:53:51 2014 -0500

    Merge remote-tracking branch 'origin/master' into f20

 sword.spec |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
---