Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git@amoeba.ucsd.edu:txrabbitmq
Browse files Browse the repository at this point in the history 
Conflicts:
	setup.py
  • Loading branch information
@clemesha-ooi
clemesha-ooi committed May 19, 2010
2 parents 486a5b7 + 1f29c3c commit 4369fa1
Show file tree
Hide file tree
Showing 2 changed files with 668 additions and 663 deletions.
Loading

0 comments on commit 4369fa1

Please sign in to comment.