Merge branch 'maint-1.0'
1656d05b24ea
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 28 2012, 12:47.

Description

Merge branch 'maint-1.0'

Conflicts:
modules/websubmit/lib/websubmit_file_converter.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 28 2012, 12:47

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:1656d05b24ea: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 28 2012, 12:47

	Commit			Author	Details	Committed
	cd16af2bb704			Samuele Kaplun/Tibor Simko	WebSubmit: unoconv calling fix	Aug 28 2012

				Path
	M			modules/websubmit/lib/websubmit_file_converter.py