Merge remote-tracking branch 'origin/master'
commit4b88c6a8fa660a0a48cb7519e4044395c2c25169
authorPootle server <pootle@cihar.com>
Fri, 21 Oct 2011 12:40:08 +0000 (21 14:40 +0200)
committerPootle server <pootle@cihar.com>
Fri, 21 Oct 2011 12:40:08 +0000 (21 14:40 +0200)
tree036e15177d8797f96e36b7fc495cdabdc79b62c9
parentb90ef4689a39a648c90633ab77ea36dc7d6dd3a4
parent20a57d1feaf48102c768ca678b695ba06ac3f340
Merge remote-tracking branch 'origin/master'