Merge branch 'master' into MaidenBeast/translation_updates
authorMaidenBeast <fel.sallustio@gmail.com>
Sun, 31 Jul 2011 19:01:05 +0000 (21:01 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Sun, 31 Jul 2011 19:01:05 +0000 (21:01 +0200)

Trivial merge