Zentyal/zentyal — pull request #1280 by jacalvo (2014-04-25 10:09:25+00:00)
Title: Merge pull request #760 from Zentyal/jag/openchange-autodiscover

Added autodiscovery to openchange
Conflicts:
main/core/ChangeLog
main/openchange/ChangeLog
main/openchange/src/EBox/OpenChange.pm