[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sun, 9 Dec 2012 18:26:43 +0000 (19:26 +0100)
committerAntony Lesuisse <al@openerp.com>
Sun, 9 Dec 2012 18:26:43 +0000 (19:26 +0100)
commit0ef9f2e4b6d9526bd26facc3cd263c52058915de
tree441436402f05ba63f4dbe969bf5778541e074e6c
parent5790312d65789ed7ee372c6ccf9759fba61bb91a
parent19608971dd07b6fa4dc15975fb8bb2ab68f0c42b
[MERGE] trunk

bzr revid: al@openerp.com-20121209182643-9fv5ge2b2r2hrpbv
openerp/service/__init__.py