Changed the way in which we restart dansguardian to update (possible) new config
Resource unmanaged detection method added
If a resouce is unmanaged, the help button will show detailed info
Fix i18n
Merge branch 'master' into mjulian/unmanaged-resources-help
Added documentation
Merge branch 'master' into ejhernandez/more-fixes-i18n
Fixing more errors in HA i18n messages
Allow require an DO, let don't
More generic help message for thin clients options page
Corrected previous commit. Mode 644 is forced to every DG config file
reverted preious commit
Fix external error string
Fix help message in RPCProxy model
Merge branch 'master' into ejhernandez/more-fixes-i18n
wait a bit in multigwRoutes to give time to dhcp/pppoe to register addresses

Conflicts:
	main/network/debian/precise/changelog
resources widget restyle
Fixes on zentyal-openchange i18n
fix dependency version for ANSTE tests
Merge branch '3.2' into 3.3