Merge remote-tracking branch 'origin/master'
authorKamil Madac <kamil.madac@gmail.com>
Tue, 3 Dec 2013 15:34:02 +0000 (16:34 +0100)
committerKamil Madac <kamil.madac@gmail.com>
Tue, 3 Dec 2013 15:34:02 +0000 (16:34 +0100)
Conflicts:
test_requests.py


Trivial merge