Merge remote branch 'origin/master'
commit5c0bc72ca74b17c07a7a29c96df244c1b2d7bfd2
authorPootle server <pootle@cihar.com>
Mon, 3 Jan 2011 21:40:06 +0000 (3 22:40 +0100)
committerPootle server <pootle@cihar.com>
Mon, 3 Jan 2011 21:40:06 +0000 (3 22:40 +0100)
tree6e773eefef2f227700832aa0e88a27ba62697bde
parenta43353cb5f737004f4297d8949e420d7bb0e72bc
parent5bae920417fbc993a262e4e93af00f02ae225efe
Merge remote branch 'origin/master'