Changeset [65ba2da8ea7ca225e8391f90b990c92c961d6766] by Craig P Jolicoeur
Revision 65ba2da8ea7ca225e8391f90b990c92c961d6766,
committed by Craig P Jolicoeur
· October 26th, 2009 @ 09:04 AM
Merge branch 'master' of git@github.com:cpjolicoeur/cerberus
Conflicts:
Todo.txt
http://github.com/cpjolicoeur/cerberus/commit/65ba2da8ea7ca225e8391...
4 changed files
-
M
Hacking.txt -
M
Todo.txt -
M
lib/cerberus/manager.rb -
M
test/integration_test.rb