diff options
| author | vta vta@openerp.com <> | 2012-12-14 13:34:56 +0100 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-12-14 13:34:56 +0100 |
| commit | 8104613242cbe718539f1fd5f74e21bda0a39329 (patch) | |
| tree | 13e1c093115744861ab6b7c64973c1400053ce28 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 4c02283a78681cbc54faf87b077b78ad43e6615e (diff) | |
| parent | 34100dd535bb77dc442cbecc3d8ff2fde169faf0 (diff) | |
[MERGE] Latest trunk + resolve conflicts
bzr revid: vta@openerp.com-20121214123456-s8rb12lmd3fi8t94
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions