Changeset [add5867fdeb06d3ebe20c0ff4e48ac52eb3399e9] by Craig P Jolicoeur
Revision add5867fdeb06d3ebe20c0ff4e48ac52eb3399e9,
committed by Craig P Jolicoeur
· March 20th, 2010 @ 01:18 PM
Merge branch 'master' of github.com:cpjolicoeur/cerberus
Conflicts:
Changelog.txt
http://github.com/cpjolicoeur/cerberus/commit/add5867fdeb06d3ebe20c...
7 changed files
-
M
Changelog.txt -
M
Todo.txt -
M
doc/site/src/credits.page -
M
doc/site/src/options.page -
M
lib/cerberus/config.example.yml -
M
lib/cerberus/publisher/rss.rb -
M
lib/cerberus/scm/bzr.rb