Merge remote-tracking branch 'origin/master'
commitb6bee6af8ab7a6eb9b00d62bc7481c5c2db24f57
authorPootle server <pootle@cihar.com>
Mon, 22 Aug 2011 10:40:14 +0000 (22 12:40 +0200)
committerPootle server <pootle@cihar.com>
Mon, 22 Aug 2011 10:40:14 +0000 (22 12:40 +0200)
tree9f5873231bcbf858b6bdf4d19ee47d0620ed371e
parent551f82e53a918996b3beb3a81d4bd9f690f01d52
parent958fcf97f43984ac6f7be07b24a2eec9bf68f252
Merge remote-tracking branch 'origin/master'