Xavier Morel a2b23a1ca7 [REM] merge conflict file committed ...

bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6

2012-11-29 12:23:50 +01:00

..

lib

[MERGE] from trunk

2012-11-29 10:10:38 +01:00

src

[FIX] server-sourced fields_get has no indirection to the model's fields

2012-11-29 11:38:41 +01:00

test

[REM] merge conflict file committed

2012-11-29 12:23:50 +01:00