Merge remote-tracking branch 'origin/master'
commit6846d5895111c4e3497c27c75bdea783331e187c
authorPootle server <pootle@cihar.com>
Sat, 15 Oct 2011 12:40:12 +0000 (15 14:40 +0200)
committerPootle server <pootle@cihar.com>
Sat, 15 Oct 2011 12:40:12 +0000 (15 14:40 +0200)
treeb7cb67a743349c358045bc276f94782c16787ad0
parentaf0ef1f868fd005de20b6a91169f58070e7dc5c5
parent4d16994ffe7f59770cfc7a1e6ee59827596d78b7
Merge remote-tracking branch 'origin/master'