Merge branch 'bug-896' into release 2011-03-16
authorMichael Tänzer <neo@nhng.de>
Tue, 15 Mar 2011 23:05:22 +0000 (00:05 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 15 Mar 2011 23:05:22 +0000 (00:05 +0100)
Conflicts:
locale/ru.po


Trivial merge