]> jfr.im git - z_archive/twitter.git/commit
Merge commit 'origin/master' into twitter_agent
authorHatem Nassrat <redacted>
Sat, 14 Feb 2009 06:41:43 +0000 (02:41 -0400)
committerHatem Nassrat <redacted>
Sat, 14 Feb 2009 06:41:43 +0000 (02:41 -0400)
commitc8d451e84b52bff57d38c9c6bcfcb4ab21281db6
tree9c5891e2278877d9fdb8a75a996ef8cbffd91c6a
parenta5935173ae56efcf63f85b93e7b0b97c52c1e0e0
parent02121d767269a2d3ce62dcf8270dba54fcd6ac86
Merge commit 'origin/master' into twitter_agent

* commit 'origin/master':
  Documentation for searching was incorrect, fixed
  Bugfix-- twitterbot help message was not showing when no ini file present
  New functionality... time for v0.5
  Add Wes D. to AUTHORS file.
  Add reply action (patch by Wes Devauld)
  Add Hatem to AUTHORS file, prep for 0.4.5 release soonish
  Allowing the choice of twitter domain.

Conflicts:
twitter/api.py
twitter/api.py