Merged r10438 from trunk.
authorjplang <jplang@e93f8b46-1217-0410-a6f0-8f06a7374b81>
Sat, 29 Sep 2012 16:32:11 +0000 (16:32 +0000)
committerjplang <jplang@e93f8b46-1217-0410-a6f0-8f06a7374b81>
Sat, 29 Sep 2012 16:32:11 +0000 (16:32 +0000)
commitddbb5e2ffc8c71a4bb50fbb663c83ed09d7a1590
tree1a96f329b9a37eea1cbd9976803506f97c3a72b2
parent681b4fe6eca51cc533a0b492d607e894a9eede76
Merged r10438 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.1-stable@10524 e93f8b46-1217-0410-a6f0-8f06a7374b81
app/models/user_preference.rb
test/unit/user_preference_test.rb