Merge remote branch 'origin/master'
commit4261e517dd861aff0da00da24c9c29f4ddfdccad
authorPootle server <pootle@cihar.com>
Wed, 15 Dec 2010 19:40:08 +0000 (15 20:40 +0100)
committerPootle server <pootle@cihar.com>
Wed, 15 Dec 2010 19:40:08 +0000 (15 20:40 +0100)
treeeb904e8c3357db8c6bd3c7e3943c58af7a76f578
parente2a9fc2b72be9a62890853f16252ed03f4203f89
parent92008fc9b1677fada4c41bc89dc5a29e6f584684
Merge remote branch 'origin/master'