Merge remote-tracking branch 'origin/DS-2887' into DS-2887 · LotteHofstede/DSpace@f3220cd · GitHub

Commit

Merge remote-tracking branch 'origin/DS-2887' into DS-2887

Browse files

Conflicts:
	dspace-xmlui/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java

Loading branch information

PhilipVis committed Feb 12, 2016

2 parents f65ea56 + 6239f66 commit f3220cd