Merge branch 'fixup' into QA_3_3
commit459fe9e905be784bcb0d3ce8ad54486c906be938
authorMichal Čihař <michal@cihar.com>
Wed, 24 Mar 2010 10:10:16 +0000 (24 11:10 +0100)
committerMichal Čihař <michal@cihar.com>
Wed, 24 Mar 2010 10:10:16 +0000 (24 11:10 +0100)
tree7371e84072cf9f5b5c94cc55c2e5ac6ee6faf83a
parente8d86a5869d45a5e019bf9460d5fb0c9b398216f
parentcdef72f707e0f2a5ebf0a6a897811795f7dea165
Merge branch 'fixup' into QA_3_3

Conflicts:
lang/belarusian_latin-utf-8.inc.php
lang/belarusian_latin-utf-8.inc.php