diff options
| author | Raphaël Valyi <rvalyi@gmail.com> | 2009-10-28 18:12:54 -0200 |
|---|---|---|
| committer | Raphaël Valyi <rvalyi@gmail.com> | 2009-10-28 18:12:54 -0200 |
| commit | 2686991976e4862ad42cdc3c504fd56f9177448f (patch) | |
| tree | a3848c86b58b3ca451e06e8b440abeae2255684f /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | ece8b2918a786b93e7fdb38ae64dcca1a5333428 (diff) | |
[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.
lp bug: https://launchpad.net/bugs/429519 fixed
bzr revid: rvalyi@gmail.com-20091028201254-oxcmetgpxbp2oelp
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions