[MERGE] evalpocalypse
authorXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 09:11:49 +0000 (10:11 +0100)
committerXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 09:11:49 +0000 (10:11 +0100)
commit123816468061d03bc9139d6cc1cfb2846e7e28dd
tree6a3a76746fd3e5559208886a52269019c00b6b51
parent396f76c95a65ccf8d7c089f8d7d38479e3af2c95
parente00cb36f41ced6e3ccadd9d0bac0e1ab88e21fc3
[MERGE] evalpocalypse

bzr revid: xmo@openerp.com-20121129091149-0k26u2mmjzaa2c1a