-
Committer:
Raphaël Valyi
-
Date:
2009-10-28 20:12:54 UTC
-
Revision ID:
rvalyi@gmail.com-20091028201254-oxcmetgpxbp2oelp
[MERGE] bzr merge -r 1856..1857 lp:openobject-server . rev #1857 we merge here consists in a fix by Tiny because they didn't applied the etree conversion properly weeks back (the 2 previous merges here); part
was already better merged on our side (2 commits back) because we resolved the conflicts more carefully.