Merge remote-tracking branch 'origin/master'
commit3fa41c7a0a8d7f4f6d162a2229727e285063651e
authorPootle server <pootle@cihar.com>
Sat, 20 Aug 2011 20:40:14 +0000 (20 22:40 +0200)
committerPootle server <pootle@cihar.com>
Sat, 20 Aug 2011 20:40:14 +0000 (20 22:40 +0200)
tree31a2f94e78f5b9d56dfec4b85720c2d53d62901b
parentddc856ae04f0312e296fd3f5f0d559ffe2048af8
parenta62aa22ad5dfe90191f9186dcf3bd7c18c2a021a
Merge remote-tracking branch 'origin/master'