Merge remote branch 'origin/master'
commit491eb07e4ffc851151e875dbe7c67e153931f984
authorPootle server <pootle@cihar.com>
Wed, 5 May 2010 09:11:04 +0000 (5 11:11 +0200)
committerPootle server <pootle@cihar.com>
Wed, 5 May 2010 09:11:04 +0000 (5 11:11 +0200)
tree21f098e9c496acbc37c9895bd8b0ac6d98650a96
parentf0a2923629ff316cd3bfec098be13522db1d5894
parent2182098af6d1ab1fc85784793605991f7d1cd595
Merge remote branch 'origin/master'

Conflicts:
po/sl.po
po/sl.po