Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. ... bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk		2014-01-16 11:39:10 +01:00
..
__init__.py	[IMP] hr_holidays:	2013-08-09 16:47:52 +02:00
common.py	[IMP] hr_holidays:	2013-08-09 16:47:52 +02:00
test_holidays_flow.py	[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.	2014-01-16 11:39:10 +01:00