Merge remote-tracking branch 'origin/master'
commitac94d08c1322744336969fa6d962b03edf406942
authorPootle server <pootle@cihar.com>
Thu, 15 Dec 2011 23:40:10 +0000 (16 00:40 +0100)
committerPootle server <pootle@cihar.com>
Thu, 15 Dec 2011 23:40:10 +0000 (16 00:40 +0100)
tree794fb8dbc5ae3840869df4cf712cf2913c9eac3c
parenta0afe72fa7d0d3b1edce2fd948128f2a9371c339
parent64d4f8b00c03e2d9b20baa307597f856931b3d5b
Merge remote-tracking branch 'origin/master'