From: Idan Gazit <idan@gazit.me>
Date: Tue, 13 Mar 2012 19:59:33 +0000 (-0700)
Subject: Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop
X-Git-Tag: v0.11.1~11^2~12^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17170a2ca7672c6b05282c45f91430a32d8521fc;p=services%2Fpython-requests.git

Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop
---