Merge commit '3.20110715' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 18 Jul 2011 16:41:37 +0000 (18:41 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 18 Jul 2011 16:41:37 +0000 (18:41 +0200)
commit739554622fa1caa6bcc0474ebbdcd9db3627389d
tree1c7e85d06c593d3314b94477b2102dac01ba97eb
parentf5c8fca8875e2ad76134c15bc7717ccd21cb2e18
parent98d2356ad0e1c3bbd823ab17fb51eaa794b26713
Merge commit '3.20110715' into prv/po