[MERGE] Merged with trunk addons
authorThibault Delavallée <tde@openerp.com>
Wed, 11 Jan 2012 12:55:55 +0000 (13:55 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 11 Jan 2012 12:55:55 +0000 (13:55 +0100)
commit7fd25b30f3a4ee8c33a67296b220a5bc8b34178f
tree6853a6d6b7241984ddb24e0a2f662429ad1a968f
parent22d004658afc076662b0d41cf79a02a58d12bd63
parent57bc6ec7d0819831a4b12dae95da04a774fe9335
[MERGE] Merged with trunk addons

bzr revid: tde@openerp.com-20120111125555-04w1yb6ixiewz4yl