[rubygem-httparty/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 2246ce54673b5a0877716cd9e21d793406c1e213
Merge: 30ede7b 4dbc238
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Mar 7 13:21:51 2012 +0100

    Merge branch 'master' into f17

 .gitignore                       |    1 +
 httparty-fix-failing-tests.patch |   27 +++++++++
 rubygem-httparty.spec            |  112 ++++++++++++++++++++++----------------
 sources                          |    2 +-
 4 files changed, 95 insertions(+), 47 deletions(-)
---