[MERGE] Sync with website-al branch
authorThibault Delavallée <tde@openerp.com>
Tue, 8 Oct 2013 08:40:23 +0000 (10:40 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 8 Oct 2013 08:40:23 +0000 (10:40 +0200)
commit567765166882f5d28031aec4e75b231d30553e35
tree1b4680a2ed42b84442532af2269b344650f3677e
parentb87ddc1bf47cf86e5fd9b4f594e80e7f73988b4a
parente535a152e5195f82d7d3337b707f362477dea935
[MERGE] Sync with website-al branch

bzr revid: tde@openerp.com-20131008084023-utmkc3cfhyzw5c0p