Added by Luca Abeni almost 11 years ago
Merge remote branch 'origin/documentation'
Conflicts: include/topmanager.h