Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:39:53 +0000 (04:39 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:39:53 +0000 (04:39 +0100)
commit3190e5cea75a43d38f58b8a45fbc87d5527d18f0
tree8f305a6db081f7832c7feaa4b8322cefdfc26cbc
parent5eed0fd97d3f1abcfce3288df9aeeed50967757c
parent699aa79c2e2dbec02a38ba6ff32e9c861ee9f7be
Merge commit 'upstream/master' into prv/po