Merged r12139, r12140 and r12141 from trunk to 2.3-stable (#14931)

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012144
Merged r12142 from trunk to 2.3-stable (#14931)

scm: git: change non ASCII user name variable to instance variable.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012145
Merged r12146, r12147 and r12148 from trunk to 2.3-stable (#14931)

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012151
Merged r12150 from trunk to 2.3-stable (#14931)

use assert_select instead of assert_tag in Git non ASCII path annotate test.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012152
Merged r12153 from trunk to 2.3-stable (#14931)

scm: git: fix indents of non ASCII path annotate test.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012154
Merged r12155 from trunk to 2.3-stable (#14931)

scm: bazaar: update test repository for non ASCII author.

* run "bzr branch --no-tree branch00 author_non_ascii"
* add revision to this branch

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012158
Merged r12143 from trunk to 2.3-stable (#14931)

scm: git: use "--encoding=UTF-8" for blame.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012159
Merged r12138, r12149, r12156 and r12157 from trunk to 2.3-stable (#14931)

scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012160
Merged r12172 from trunk to 2.3-stable (#14883)

Gemfile: update jdbc adapter version above 1.2.6.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012174
Merged r12173 from trunk to 2.3-stable (#14919)

Gemfile: update ruby-openid version above 2.3.0.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012178
Merged r12180 from trunk to 2.3-stable (#14886)

Norwegian translation updated by Lennart Nordgreen.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012183
Merged r12189 from trunk to 2.3-stable (#13632)

pdf: fix empty page attached when exporting.

Contributed by Jun NAITOH.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012191
Merged r12163 from trunk (#14590, #14592).

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012211
Merged r12164 from trunk (#14592).

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012212
Merged r12162 from trunk (#14902).

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012213
Merged r12202 (#14977).

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012214
2.3-stable: Gemfile: pin selenium-webdriver version 2.35.1.

selenium-webdriver requires rubyzip 1.0.0.
rubyzip 1.0.0 requires Ruby version >= 1.9.2.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012227
Merged r12229 from trunk to 2.3-stable (#15185)

Simplified Chinese translation for 2.3-stable updated.

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012233
Merged r12243 from trunk to 2.3-stable

Gemfile: remove "i18n".

activesupport 3.2.13 requires i18n 0.6.1 explicitly.
https://github.com/rails/rails/commit/197b9f4d61260bea9e2a0a4883977e02164a0667

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012244
Remove unused planning elements routes