Merge remote branch 'origin/master'
commit5a26c7e6fdd320c6eaba944855281fb6c68176c6
authorPootle server <pootle@cihar.com>
Sat, 4 Dec 2010 11:40:22 +0000 (4 12:40 +0100)
committerPootle server <pootle@cihar.com>
Sat, 4 Dec 2010 11:40:22 +0000 (4 12:40 +0100)
tree27d9b1839bd43353a1bd74084611d2feae870fc8
parent6c0cef4fa02defad0af8c6dda4a867e03fefb8b0
parent9d9d88b83f82a2026336f19140c23a313d75bd56
Merge remote branch 'origin/master'