Prevent mapistore_init() from overwriting mapping_path if it was
previously set with mapistore_set_mapping_path().
Merge pull request #44 from Zentyal/master

Merge remaining Zentyal changes to openchange master and gets everything sync'ed
Merge pull request #51 from Zentyal/master

Prevent mapistore_init() from overwriting mapping_path if it was previously set with mapistore_set_mapping_path()
replace deprecated directives
Merge branch 'master' of https://github.com/openchange/openchange
Update configure.ac version to 2.2
Remove _GNU_SOURCE reference into headers
Revert "avoid warnings of redefined _GNU_SOURCE"

This reverts commit 965f5e4eae713f2a0d35092805f77d7d9d6b0784.

Conflicts:
	configure.ac
Merge pull request #55 from openchange/jkerihuel/_gnu_source_fix

Remove _GNU_SOURCE reference into headers