Merged r10412 from trunk.
authorjplang <jplang@e93f8b46-1217-0410-a6f0-8f06a7374b81>
Sat, 29 Sep 2012 16:34:30 +0000 (16:34 +0000)
committerjplang <jplang@e93f8b46-1217-0410-a6f0-8f06a7374b81>
Sat, 29 Sep 2012 16:34:30 +0000 (16:34 +0000)
commit94d4808e96f5a6fda917c02f1f98c5b26ce6491a
tree06f062ed0994cd3297f0e6d169c9e37425fc1c81
parentddbb5e2ffc8c71a4bb50fbb663c83ed09d7a1590
Merged r10412 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.1-stable@10525 e93f8b46-1217-0410-a6f0-8f06a7374b81
app/controllers/account_controller.rb