# HG changeset patch
# User grandjoncl
# Date 1354530455 -3600
# Node ID d9ec04dce82a766d9a66dd8ad21a875686bc39dd
# Parent  a7b268e93413328fe6a3bf0ef0047cf6fa5da557# Parent  0b8497f071d10d521b4a136368f2c65fab05aed5
Merge with 0b8497f071d10d521b4a136368f2c65fab05aed5

diff -r a7b268e93413 -r d9ec04dce82a .settings/org.eclipse.core.resources.prefs
diff -r a7b268e93413 -r d9ec04dce82a src/ldt/ldt/ldt_utils/views/lignesdetemps.py
diff -r a7b268e93413 -r d9ec04dce82a src/ldt/ldt/management/commands/initsitedomain.py