Merge remote-tracking branch 'origin/master'

Conflicts:
	test_requests.py
This commit is contained in:
Kamil Madac
2013-12-03 16:34:02 +01:00
+3
View File
@@ -0,0 +1,3 @@
<component name="ProjectDictionaryState">
<dictionary name="kmadac" />
</component>