Merge branch 'maint-1.1'
4ebfdf8c8003
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 18 2013, 14:37.

Description

Merge branch 'maint-1.1'

Conflicts:
modules/bibcirculation/lib/bibcirculation_daemon.py
modules/miscutil/lib/dateutils.py
modules/miscutil/lib/dateutils_unit_tests.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 18 2013, 14:37

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:4ebfdf8c8003: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 18 2013, 14:37

	Commit			Author	Details	Committed
	8a876e573432			Wojciech Ziolek/Tibor Simko	dateutils: strftime improvement	Mar 18 2013

				Path
	M			THANKS
	M			modules/bibauthorid/lib/bibauthorid_webapi.py
	M			modules/bibcirculation/lib/bibcirculation_daemon.py
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibsort/lib/bibsort_daemon.py
	M			modules/bibsort/lib/bibsort_engine.py
	M			modules/bibsort/lib/bibsort_washer.py
	M			modules/miscutil/lib/dateutils.py
	M			modules/miscutil/lib/dateutils_unit_tests.py
	M			modules/websearch/lib/websearch_webcoll.py
	M			modules/websearch/lib/websearchadminlib.py