[MERGE] Merge with lp:openobject-server
authorBhumika (OpenERP) <sbh@tinyerp.com>
Tue, 6 Mar 2012 08:34:20 +0000 (14:04 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Tue, 6 Mar 2012 08:34:20 +0000 (14:04 +0530)
commit54a39bc87d1ed734b5b378aa975373fb078ff79c
tree43dde8a85b6916e9a73cdc63cd4fb02201aad1c2
parent0e031ccc8b4a88a184cb0cbeac93f583939dd1cb
parent1ae5913ae8fa5074be0e8da30ec318e2bdde1027
[MERGE] Merge with lp:openobject-server

bzr revid: sbh@tinyerp.com-20120306083420-r2br7skl91w78ueo
doc/index.rst
openerp/addons/base/test/test_osv_expression.yml