[httpie/f19: 2/2] Merge branch 'f20' into f19

[Ricky Elrod]

commit 2f28b23ab5da781ddfe62aa9d2a6653a75c58bc6
Merge: 82e5c8d 540ab15
Author: Ricky Elrod <ricky at elrod.me>
Date:   Fri Oct 18 21:42:58 2013 -0400

    Merge branch 'f20' into f19
    
    Conflicts:
    	httpie.spec

 httpie.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---