Merge branch 'maint-1.1'
5d284e2d8a64
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 22 2014, 17:00.

Description

Merge branch 'maint-1.1'

Conflicts:
requirements.txt

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 22 2014, 17:00

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:5d284e2d8a64: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 22 2014, 17:00

	Commit			Author	Details	Committed
	2ef19014fbbd			Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Jan 22 2014
	8b3e78f44706			Alessio Deiana/Tibor Simko	installation: pip requirement version updates	Jan 22 2014

				Path
	M			modules/bibformat/lib/elements/bfe_qrcode.py
	M			requirements.txt