OSDN Git Service

Merged r5944 from trunk.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 29 May 2011 07:47:25 +0000 (07:47 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 29 May 2011 07:47:25 +0000 (07:47 +0000)
commitfabf54a3680145b269c7c403bca2c6ef452ed8fc
tree0c8464472949da1b99135257d015b307f834be8b
parent6b07f86883cdd795b58bd8a37c57653e4646c9b3
Merged r5944 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5947 e93f8b46-1217-0410-a6f0-8f06a7374b81
app/models/journal.rb
test/fixtures/journals.yml
test/unit/activity_test.rb