Merge remote branch 'origin/master'
commit809e602f894b31207f49f94e04db325df27e6848
authorPootle server <pootle@cihar.com>
Thu, 13 Jan 2011 21:40:10 +0000 (13 22:40 +0100)
committerPootle server <pootle@cihar.com>
Thu, 13 Jan 2011 21:40:10 +0000 (13 22:40 +0100)
tree25529e10e6c7d3d016fbc8bb29065cf4966eb060
parenta1fe2f26d041d40ef55da61dffafa6570caa4ccf
parentd9f862a8c115811062f71d818c7d98e027c4f2c4
Merge remote branch 'origin/master'