Enable upgrade from 3.0 in initialSetup
samba migration from 3.0 (WIP)
Added migration from 3.0 (apache -> webadmin)
Merge branch 'master' into jacalvo/upgrade-from-3.0

Conflicts:
	main/core/ChangeLog
	main/samba/ChangeLog
some fixes
Replace zentyal-ids in debian/control for easier upgrade
zarafa migration from 3.0 (WIP)
added TODO to samba migration
some fixes and do not try to restore zarafa backup
do not try to restore 3.0 users/samba backup if fails

as the 3.1 code will be already in place this could make things even works
in case of need the packages can be downgraded to 3.0 and then restore the dumped
backup manually, but we can't do that in initialSetup()
fixes in samba migration
releasing samba 3.1.10
fixed zarafa ldap conf
Merge branch 'master' into jacalvo/upgrade-from-3.0

Conflicts:
	main/samba/ChangeLog
set installer version as rc2
Improved the way we handle L2TP daemons.
Merge pull request #607 from Zentyal/cperello/fix-l2tp-daemons

Improved the way we handle L2TP daemons.
Merge pull request #608 from Zentyal/jacalvo/upgrade-from-3.0

Jacalvo/upgrade from 3.0
Merge branch 'master' into ejhernandez/summ-logs

Conflicts:
	main/core/ChangeLog
	main/ips/ChangeLog