Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf ... bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp		2013-11-30 14:00:14 +01:00
..
css	[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf	2013-11-30 14:00:14 +01:00
img	[CLEAN] Cleaning befor merging	2013-07-23 11:55:09 +02:00
js	[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7	2013-11-27 12:00:46 +01:00
xml	[MERGE]: Merged with addons	2013-08-12 10:08:10 +05:30