[MERGE] forward port of branch 7.0 up to f5f7609
authorDenis Ledoux <dle@odoo.com>
Wed, 17 Sep 2014 11:39:13 +0000 (13:39 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 17 Sep 2014 11:39:13 +0000 (13:39 +0200)
commit60a82133cc0e0d7c4879b6c518054cbd44e20c0c
treefa78e9b6804dab6e2afdf621edf12a4acf019008
parent2ee1843757e87a75a36dce29eb47f784a4725c34
parentf5f76094a79f515b1fcddfea9b4b2e73c4189c26
[MERGE] forward port of branch 7.0 up to f5f7609
addons/auth_ldap/users_ldap.py
addons/point_of_sale/point_of_sale.py
openerp/osv/orm.py