Move cvmfs-keys files from the mount directory to their own directory
Add egi.eu and openscience.org configurations, including server ordering
Read version number from rpm package, and do changelog the way cvmfs package does it
Add egi.eu and opensciencegrid.org configuration
Move cern.ch.conf to cvmfs-keys and add egi.eu and opensciencegrid.org there
Revert "Move cern.ch.conf to cvmfs-keys and add egi.eu and opensciencegrid.org there"

This reverts commit 29e6d1efdac6291e4ec78191a9d5af32222bdfd7.
Revert "Add egi.eu and openscience.org configurations, including server ordering"

This reverts commit b3b94a12fe5b76e6945944ecb00cbcfd232d4266.
Revert "Move cvmfs-keys files from the mount directory to their own directory"

This reverts commit 6fd9616339aed9d22c9b68a078c17cd1d68584c2.
Add egi.eu and opensciencegrid.org keys & config
Merge pull request #489 from DrDaveD/global_keys

Add egi.eu and opensciencegrid.org to cvmfs-keys
Fix typo in excluding cern.ch.conf
Clean up .serverorder files when package is removed or purged
Merge pull request #492 from DrDaveD/global_keys

Fix a couple of errors in debian packaging of cvmfs-keys
add change log entry for debian
Merge pull request #493 from reneme/fix-deb_changelog

FIX: Add Changelog Entry for Debian
add 'Mock' as new SpoolerDefinition type
factor out MockUploaders for test code reuse

Conflicts:

	test/unittests/testutil.h
Merge pull request #494 from reneme/refactor-mock_uploader

Refactor: MockUploader for Unittesting Purposes
add scaffold for `cvmfs_swissknife gc`
factor out MockCatalog for code reuse