Permalink
Browse files

Merge branch 'master' into devel

Conflicts:
	rabbit/lib/rabbit_service/rabbit_node.rb
	rabbit/spec/node_spec.rb
	redis/spec/node_spec.rb

Change-Id: Ic48a69313614d79a7e7bba7dec7f555a74b699fd
  • Loading branch information...
2 parents 97b5490 + 1eea878 commit 6e778aabcd043f5756683bf363c8dc8048d87dc6 rtang committed Jul 29, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 6e778aa

Please sign in to comment.