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

Conflicts:
	islandora.info
Updated version number for 7.x-1.0
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-release
Updated version number for 7.x-1.1-RC1
Merge pull request #261 from nigelgbanks/7.x-ingest-index-problem

7.x ingest index problem
Merge pull request #265 from jordandukart/7.x

7.x
Merge pull request #263 from ajstanley/7.x

7.x
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-release
Updated version number for 7.x-1.1-RC2
Merge branch '7.x-release' of github.com:Islandora/islandora into 7.x-release
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-release
Updated version number for 7.x-1.1
Merge remote-tracking branch 'refs/remotes/Islandora/7.x-release' into 7.x