[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 20 Sep 2012 07:49:32 +0000 (09:49 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 20 Sep 2012 07:49:32 +0000 (09:49 +0200)
commit7300ba62fea97faf753ee7e6a97e9c04d610c54e
tree333ec396330a55113bc8ce2381213050014245ce
parent0d428b2b72b4c57a578f32039cb023a943a820c6
parent44f09718c9fa3937d515aa745fd61f2ca677eac1
[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120920074932-7w0zb5o979wffom5