fix rpm for fc20
fix rpm for fc20
Merge branch 'fix-fc20' into devel
fix TBB build system for 32bit on 64bit mock environments
Merge branch 'fix-tbb-build' into devel
add test case for volatile cache set
add posibility to flag repository for volatile content
add "volatile" repository and volatile cache class (CVM-263)
Merge branch 'feature-volatile-cacheset' into devel
fix rpmbuild on SL6 32bit
Merge branch 'fix-i386-build' into devel
fix rpmbuild on SL6 32bit
Merge branch 'fix-i386-build' into devel
add new switches to `cvmfs_swissknife scrub`

Conflicts:

	cvmfs/swissknife_scrub.cc
add Alerts enum
replace PrintWarning by more flexible PrintAlert

Conflicts:

	cvmfs/swissknife_scrub.h
FIX: assure canonical path output
TEST: machine readable scrub output
REFACTOR: add is_in_transaction() function in cvmfs_server
REFACTOR: introduce open_transaction() and close_transaction()