[MERGE] Sync with main website branch
authorThibault Delavallée <tde@openerp.com>
Tue, 8 Oct 2013 15:23:51 +0000 (17:23 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 8 Oct 2013 15:23:51 +0000 (17:23 +0200)
commita60a6b41d46bc86891785d31eef3b3f4c593f3b6
tree89f95ce453bb2c45de05f58b87ef1ebd7222d459
parent0390441f8526faaaa4b9e593ab622ac4e4f69a95
parent20b6367ec59ea0087a0282fbd691fc7b24d8cb8e
[MERGE] Sync with main website branch

bzr revid: tde@openerp.com-20131008152351-mqvgd1rk1136ypkb