niv-openerp ebeeae0ed4 [MERGE] saas2 ... bzr revid: nicolas.vanhoren@openerp.com-20131018134149-yveqfs6tqwnjo6xt		2013-10-18 15:41:49 +02:00
..
css	[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv	2013-11-15 11:49:09 +01:00
font	[IMP] clean permissions and shebang in files	2013-05-14 12:37:36 +02:00
img	[MERGE] forward port of branch 7.0 up to revid 3973 chs@openerp.com-20130611145028-f98x6inytlr3ijjg	2013-06-11 17:52:51 +02:00
js	[MERGE] saas2	2013-10-18 15:41:49 +02:00
xml	[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv	2013-11-15 11:49:09 +01:00