Automatic report text formatting adapted to Redmine
Clean up openchange section in stub smb.conf file
Merge pull request #993 from Zentyal/jag/smb-stub-oc-cleanup

Clean up openchange section in stub smb.conf file
Merge pull request #989 from Zentyal/jacalvo/bugreport-format

Automatic report text formatting adapted to Redmine
Start the management of sub-PSGI apps
use camel case for subApps
Use OO for Plack::Builder

To be able to mount PSGI sub-apps
Use PSGI with Plack to run a SOAP server to run jobs
Merge branch 'master' into ejhernandez/soap-server-in-psgi
Fix RESTClient constructor
Merge branch 'ejhernandez/fix-rs-reg' into ejhernandez/soap-server-in-psgi
Starting to give support to SSL validation in sub PSGI apps
Fixed bad behaviour in interfaces method wizard
Revert "Avoid division by zero when pagination"

This reverts commit 665f5629483a8fb52878bcbb6f9a92a23a9ea25d.
Added lock to cloud-sync script

Conflicts:
	main/users/ChangeLog
Create directories in _setConf to avoid invalid group __USERS__ error
Ported restricted resources to use nginx
adapt sogo to apache 2.4
fix dlz path in 32bit arch
workaround for the 100% cpu bug in the graphical environment