FIX: minor merge error
FIX: minor merge error

djw8605/cvmfs,MicBrain/cvmfs,cvmfs/cvmfs,ruvolof/cvmfs,Gangbiao/cvmfs,cvmfs/cvmfs,MicBrain/cvmfs,cvmfs-testing/cvmfs,bbockelm/cvmfs,djw8605/cvmfs,Moliholy/cvmfs,DrDaveD/cvmfs,ruvolof/cvmfs,alhowaidi/cvmfsNDN,alhowaidi/cvmfsNDN,djw8605/cvmfs,cvmfs/cvmfs,cvmfs/cvmfs,cvmfs/cvmfs,ruvolof/cvmfs,trshaffer/cvmfs,btovar/cvmfs,ruvolof/cvmfs,DrDaveD/cvmfs,alhowaidi/cvmfsNDN,Moliholy/cvmfs,cvmfs-testing/cvmfs,ruvolof/cvmfs,djw8605/cvmfs,DrDaveD/cvmfs,trshaffer/cvmfs,trshaffer/cvmfs,djw8605/cvmfs,trshaffer/cvmfs,alhowaidi/cvmfsNDN,bbockelm/cvmfs,DrDaveD/cvmfs,reneme/cvmfs,btovar/cvmfs,reneme/cvmfs,btovar/cvmfs,cvmfs/cvmfs,bbockelm/cvmfs,cvmfs-testing/cvmfs,cvmfs-testing/cvmfs,MicBrain/cvmfs,cvmfs/cvmfs,trshaffer/cvmfs,btovar/cvmfs,MicBrain/cvmfs,Gangbiao/cvmfs,Gangbiao/cvmfs,reneme/cvmfs,Moliholy/cvmfs,alhowaidi/cvmfsNDN,cvmfs-testing/cvmfs,DrDaveD/cvmfs,bbockelm/cvmfs,btovar/cvmfs,Gangbiao/cvmfs,DrDaveD/cvmfs,reneme/cvmfs,Moliholy/cvmfs,reneme/cvmfs,Moliholy/cvmfs,MicBrain/cvmfs,Gangbiao/cvmfs,bbockelm/cvmfs,DrDaveD/cvmfs