Merge branch 'maint'
d51d2da52536
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 25 2010, 17:09.

Description

Merge branch 'maint'

Note: I did not merge the above commit from maint' to master' due to some conflicts and no test cases; please prepare a clean patch for `master'. (addresses #352)

Conflicts:
modules/bibupload/lib/bibupload.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 25 2010, 17:09

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:d51d2da52536: Merge branch 'maint' (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 25 2010, 17:09

	Commit			Author	Details	Committed
	967346d52b28			Samuele Kaplun/Tibor Simko	BibUpload: improve bibdocfile URL recognition	Nov 25 2010

This commit is empty and does not affect any paths.