Merge remote branch 'origin/master'
commitb18c409251b2233b804004c22118865efbb45a6c
authorPootle server <pootle@cihar.com>
Mon, 7 Jun 2010 18:40:29 +0000 (7 20:40 +0200)
committerPootle server <pootle@cihar.com>
Mon, 7 Jun 2010 18:40:29 +0000 (7 20:40 +0200)
tree5a6396c5b0a40a002fa84f9ea8ec19b275c83065
parent0fa21b5527b9b47f4575ac8a0491a1356a1d5ab9
parent1649a0a1c4e5d049e7b2e064d660439286fe0894
Merge remote branch 'origin/master'