Author: Chris St. Pierre
Revision Date: 2013-11-11 20:46:09 UTC

Merge branch 'maint'

Conflicts:
 src/lib/Bcfg2/Server/Admin/Compare.py
 src/lib/Bcfg2/Server/Admin/Snapshots.py
 src/lib/Bcfg2/Server/MultiprocessingCore.py
 src/lib/Bcfg2/Server/Plugins/Probes.py
 src/sbin/bcfg2-crypt
 src/sbin/bcfg2-reports
 tools/upgrade/1.3/migrate_configs.py
 tools/upgrade/1.3/migrate_perms_to_mode.py