Merge branch 'maint-1.0'
a65fe787a12f
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 11 2012, 09:50.

Description

Merge branch 'maint-1.0'

Conflicts:
modules/bibconvert/doc/admin/Makefile.am

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 11 2012, 09:50

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:a65fe787a12f: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 11 2012, 09:50

	Commit			Author	Details	Committed
	bbd3a8ee40b2			Tibor Simko	BibConvert: fix for static files in admin guide	Sep 11 2012

				Path
	M			modules/bibconvert/doc/admin/Makefile.am
	M			modules/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
	M			modules/bibconvert/lib/bibconvert_regression_tests.py
	M			modules/miscutil/lib/inveniocfg.py