Merge remote branch 'origin/master'
commit867892816d37dde8e2848c6f659f174837a1e147
authorPootle server <pootle@cihar.com>
Thu, 13 Jan 2011 23:40:06 +0000 (14 00:40 +0100)
committerPootle server <pootle@cihar.com>
Thu, 13 Jan 2011 23:40:06 +0000 (14 00:40 +0100)
tree25529e10e6c7d3d016fbc8bb29065cf4966eb060
parent809e602f894b31207f49f94e04db325df27e6848
parent5ed1d80bff394d913decff2caad545f69d850de0
Merge remote branch 'origin/master'