Merge remote-tracking branch 'origin/master'
commit6ce8caacd7c010db8d437fde377ca689c058226f
authorPootle server <pootle@cihar.com>
Tue, 30 Aug 2011 10:40:14 +0000 (30 12:40 +0200)
committerPootle server <pootle@cihar.com>
Tue, 30 Aug 2011 10:40:14 +0000 (30 12:40 +0200)
treeb6c872db35c3c3425179df8975a0876aa9e36e43
parentb0016d6500d728794f211b51dd700be47779a47b
parent3b051e43136d96ceaf8970d8900996480b0f22e4
Merge remote-tracking branch 'origin/master'