[MERGE] with trunk

bzr revid: nwi@openerp.com-20121220111536-z8d07d11g9z2ziyv
This commit is contained in:
Niko
2012-12-20 12:15:36 +01:00
parent c4e768b430
commit 9a2ea2fc98
View File