merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 4 Oct 2013 08:23:09 +0000 (10:23 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 4 Oct 2013 08:23:09 +0000 (10:23 +0200)
commit48e38346930c3c05a50364a17eb20fa6ded5ee69
tree1af449a6d39d193ed74b7e630106b766f1399421
parentcf17ef3b3bab5d68b4b6a3d23482d8d1cde86228
parentea7df9d65b345a5fe6f044441ddf14f660c4d619
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20131004082309-67hrr8mykykjyh31