[merge] merge trunk-minimal-bin-chs branch
authorChristophe Simonis <chs@openerp.com>
Fri, 23 Nov 2012 11:09:08 +0000 (12:09 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 23 Nov 2012 11:09:08 +0000 (12:09 +0100)
commit246878558c16ff495efe0b5279f8ac01fc5fbbb3
treecc8205dc8575e939e662f70f7c31ec7cf9ed19e2
parent0e50931671e8911bc7e53b8ca652c65a31bf73da
parenta9094cc3ce004c9517003df5d90c3e59e625a823
[merge] merge trunk-minimal-bin-chs branch

bzr revid: chs@openerp.com-20121123110908-sxhxl7k907jytzrr
openerp/main.py