diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-20 10:25:25 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-20 10:25:25 +0100 |
| commit | 73da643cd3675ba99a08f746ba8932d98a03f2a8 (patch) | |
| tree | 59f172036a80016ef7d2504027da0fb485af8b1e /addons/analytic_user_function | |
| parent | f529de5625f318f01db5c9a99c66b905caad7e5a (diff) | |
| parent | 57505a1b2477110976c7fc69f5e3a29f4d064651 (diff) | |
[MERGE] Correct merge of parents
bzr revid: rim@openerp.com-20140120092525-k4k8rxvh304tvy0i
Diffstat (limited to 'addons/analytic_user_function')
0 files changed, 0 insertions, 0 deletions