merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 12:06:18 +0000 (14:06 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 12:06:18 +0000 (14:06 +0200)
commit5408aa87018dabe7c11bd848d2250903f2ba9d04
tree8e63ed59dc1883b70076b3608bf22bbf602da7bd
parent6a1079822e25799240f91a0f878eb87239c81147
parent5696282656e22df91591800333258d6ecf378df2
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20131018120618-0o7hsq6pb7b4zw37