[python-requests/f18: 2/2] Merge branch 'master' into f18

[Toshio くらとみ]

commit 2ab0fb4e349e84af03b039571c9b001352ba5391
Merge: 3de3e1b 4d0266e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 8 13:38:33 2013 -0800

    Merge branch 'master' into f18

 python-requests.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---