[MERGE] merged the apa server branch
authorqdp-launchpad@tinyerp.com <>
Thu, 25 Nov 2010 10:13:35 +0000 (11:13 +0100)
committerqdp-launchpad@tinyerp.com <>
Thu, 25 Nov 2010 10:13:35 +0000 (11:13 +0100)
commit1965f8ba3ed4c6dcbf2a6fd2c8b2ce0de08c6876
treee7c123d2c4e1644164b1d8195412fb263493aa29
parent219edf4cab34b5be7cf5640ca529062910c677e6
parentf1817dae8d101ac907891b5b9f582a686c4179b7
[MERGE] merged the apa server branch

bzr revid: qdp-launchpad@tinyerp.com-20101125101335-2f5gyrmaxmowicw0