Merge remote-tracking branch 'origin/master'
commit6bc284c9257f646089ddfb6a4dd53286812b696f
authorPootle server <pootle@cihar.com>
Wed, 19 Oct 2011 18:40:31 +0000 (19 20:40 +0200)
committerPootle server <pootle@cihar.com>
Wed, 19 Oct 2011 18:40:31 +0000 (19 20:40 +0200)
treed3a6436e70b672090533d9b277f1aed05d438878
parentf1d3f6248dee66a3c4fdc6860da26b5de027f293
parent9db5e4447c9249a92ca3283d452513c10d79a380
Merge remote-tracking branch 'origin/master'