Updated version number for 7.x-12.1.0-RC1
Updated version number for 7.x-1.0-RC1
Merge branch '7.x' into 7.x-release
Updated version number for 7.x-1.0
Merge branch '7.x' of github.com:Islandora/islandora_solr_search into 7.x-release

Conflicts:
	islandora_solr.info
Updated version number for 7.x-1.1-RC1
Merge remote branch 'upstream/7.x-release' into flvc