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)
commit12205be01944d2b1c124963cff1dd26ef6333ea9
tree723e2266202724d334ce994e6e0e9367ae10bd99
parent6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa
parentd48e21cdb270945083df222ea16720a0e279a3c0
Merge branch 'bug-896' into release

Conflicts:
locale/ru.po