Merge remote-tracking branch 'origin/master'
commit694f3d23bad5e503fa784469c272b97334097ef1
authorPootle server <pootle@cihar.com>
Wed, 26 Oct 2011 16:40:11 +0000 (26 18:40 +0200)
committerPootle server <pootle@cihar.com>
Wed, 26 Oct 2011 16:40:11 +0000 (26 18:40 +0200)
tree982c511078db69e835054037c56b989485db29db
parentc62e3891525408a422ea77808e00aed78170a0b2
parent977be12bda0f67d9f3b81bc2fa4a11af68b4d7b3
Merge remote-tracking branch 'origin/master'