Merge branch 'release-v3.0.0' into stable
Merge branch 'release-v3.1.0' into stable
Merge branch 'release-v3.2.0' into stable
Merge branch 'release-v3.2.1' into stable
Merge branch 'release-v3.2.2' into stable
Merge branch 'master' into stable
Merge branch 'release-v3.3.0' into stable
Correctly copy advanced workflow settings #904

Original commit message:
Fixed: Workflow copy does not copy advanced workflow settings

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@6148 e93f8b46-1217-0410-a6f0-8f06a7374b81
Stick with a working version of mocha

mocha 0.12.2 is known not to work with test/unit:
https://github.com/freerange/mocha/issues/94

Pinning the version of mocha until this is resolved
Set default category_id instead of the object #1087

Rails 2.3 still has issues with synchronizing the association_id
and association attributes of an object. That means, if you set the
association with an object first and then just set the id afterwards, the object wins and the setting of the id gets lost.

This is not an issue in Rails >= 3.1 anymore.
Display sidebar queries outside of a project #1090
wiki-text monospaced 11px
Update package list before installing packages on Travis
Make the commented configuration.yml.example more approachable #1144
Add localized translation for Time entry menu. #1118
Add a CONTRIBUTING guide. #1192
add travis build status to README.rdoc
Install Darcs 2.3 on Travis CI #1142

Our tests break on Darcs >=2.5 as Darcs changed the repository
format and the command API.
Use capybara < 2 as capybara 2 drops ruby 1.8 support
Make the WikiContentJournal class available during migration #1194