]> source.dussan.org Git - redmine.git/commit
Merge branch 'master' into plugin-hooks
authorEric Davis <edavis@littlestreamsoftware.com>
Mon, 28 Jul 2008 23:14:10 +0000 (16:14 -0700)
committerEric Davis <edavis@littlestreamsoftware.com>
Mon, 28 Jul 2008 23:14:10 +0000 (16:14 -0700)
commitc5242b4386aaebd348cc069c9af9f1fba8eaaa63
treebf72c2324bec2b4d84b7f5ef127cb3094e9e94a4
parent6615002df28cca05c76202b3bc18b6699842dac3
parentb91bdf8798360aa913ac97167c4925f95faa3673
Merge branch 'master' into plugin-hooks

Conflicts:

lib/redmine/plugin.rb
lib/redmine/plugin.rb