Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8 ... bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62 bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m		2013-11-21 16:42:05 +01:00
..
data	[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8	2013-11-21 16:42:05 +01:00
static/description	[IMP] move html module description and icon	2013-06-28 12:04:41 +02:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] l10n_mx: manual merge of updated l10n_mx, courtesy of Vauxoo	2012-12-18 03:37:14 +01:00