Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 29 Jun 2010 13:53:51 +0000 (15:53 +0200)
committerintrigeri <intrigeri@boum.org>
Tue, 29 Jun 2010 13:53:51 +0000 (15:53 +0200)
commit1786b106a9c7f448136ff47d9b6dd26d48a5dd2e
treeedfeed77be4a56ed06095bd67eb7cbc05a1a1eca
parentb225fdc44d4b3d2853db622d59aed7b59788aeec
parentbe60d261e6cbee094e4df74e1bb24c8ad3dc393d
Merge remote branch 'upstream/master' into prv/po

Conflicts:
doc/plugins/po.mdwn
doc/plugins/po.mdwn