merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 12:06:48 +0000 (14:06 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 12:06:48 +0000 (14:06 +0200)
commitbf25c5ce8f4652c3ea38c006bdcf11a1ab7a39b0
tree335211f937ad343c951ca307588bfef0142baf6e
parent954f9ea511ccabaa3f683503bd8d78b5e36eb775
parent67a9fee553439e573fec2d98c35570a89fa001c5
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20131018120648-jtowyzes1zgm98dn