Conflicts:
	shell/source/backends/gconfbe/gconfbackend.cxx

Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>