Merge branch 'master' into release-v2.0.0
authorEric Davis <edavis@littlestreamsoftware.com>
Sat, 2 Jul 2011 04:46:38 +0000 (21:46 -0700)
committerEric Davis <edavis@littlestreamsoftware.com>
Sat, 2 Jul 2011 04:46:38 +0000 (21:46 -0700)
commit30bcd6c66b300f5b7f9905f3df67a3ab423b3f43
treeaee9e138797549fafe4fb7657d126dc6b924c4e6
parent2fab2de5175c9d185d529e33309b6d87ee2d13f0
parent39be3ac130a71be543fef2267045738c8dda4ed2
Merge branch 'master' into release-v2.0.0

Conflicts:
doc/CHANGELOG.rdoc
lib/redmine/version.rb
app/views/wiki/show.rhtml
doc/CHANGELOG.rdoc