projects / services / python-requests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 882ea76 4922daf)
Merge branch 'feature/unicode' into feature/fo
authorKenneth Reitz <me@kennethreitz.com>
Sat, 20 Aug 2011 23:30:46 +0000 (19:30 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 20 Aug 2011 23:30:46 +0000 (19:30 -0400)
Conflicts:
AUTHORS

1  2 
AUTHORS patch | diff1 | diff2 | blob | history

diff --cc AUTHORS
index ed833ff,1cf7d35..f79dd80
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -39,4 -39,4 +39,5 @@@ Patches and Suggestion
  - Shrikant Sharat Kandula
  - Mikko Ohtamaa
  - Den Shabalin
- - Alejandro Giacometti
 -- Rick Mak
++- Alejandro Giacometti
++- Rick Mak
Domain: SCM / CI Services;