Merge branch 'maint-1.1'
bbbed7322c5e
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 22 2015, 15:27.

Description

Merge branch 'maint-1.1'

NOTE The merge conflicts resolved according to PR #2683 with some amended statements. Also, added some more unzip -u flags.

Conflicts:
Makefile.am

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 22 2015, 16:36

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:bbbed7322c5e: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 22 2015, 16:36

	Commit			Author	Details	Committed
	bdf145891b5f			Alexander Wagner/Tibor Simko	installation: explicit jQuery plugin versions	Jan 22 2015

				Path
	M			Makefile.am