[IMP] Allow openerp.tools.convert_file() to optionally take the full path name
[FIX] doc typo
[IMP] Allow openerp.modules.load_information_from_description_file() to take an optional mod_path argument
[WIP] added virtual field. will probably change the name of this field
[IMP] better syntax for routing_map cache invalidation
[MERGE] upstream
[MERGE] upstream
[REV] revert refresh_routing_map
[FIX] Set correct record id for <template> tag converter
[REM] not using the ir.module.module 'virtual' field after all

fp said the non existent module warning is not a problem
[MERGE] remote module import
[IMP] reduced image size
[IMP] reduced flag size
[IMP] reduced size flags
Merge branch 'master' of bzr::lp:openobject-server