Merge remote-tracking branch 'origin/master'
commit026999adb7eacc7f0ef956abceef0ffa8aab5bb4
authorPootle server <pootle@cihar.com>
Thu, 14 Jul 2011 00:40:19 +0000 (14 02:40 +0200)
committerPootle server <pootle@cihar.com>
Thu, 14 Jul 2011 00:40:19 +0000 (14 02:40 +0200)
treec381eb47daa96b2c015fb5670520a6c73669579d
parent118a4e2fdd05eabc9dd7a139256be8ee33d92f86
parentad87dcf884efa277fc9ed546e1986e511ae7928a
Merge remote-tracking branch 'origin/master'