[3/3] marmotta git commit: merged develop into MARMOTTA-584

[wikier]

merged develop into MARMOTTA-584


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ad1333de
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ad1333de
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ad1333de

Branch: refs/heads/MARMOTTA-584
Commit: ad1333de1608f78f694b5bc53b37dc4d8f442482
Parents: 710d98a 5daafbb
Author: Sergio Fernández <wik...@apache.org>
Authored: Tue Sep 15 11:45:37 2015 +0200
Committer: Sergio Fernández <wik...@apache.org>
Committed: Tue Sep 15 11:46:02 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/config-defaults.properties             | 7 -------
 .../src/main/resources/config-descriptions.properties         | 4 ----
 .../core/services/config/ConfigurationServiceImpl.java        | 1 -
 3 files changed, 12 deletions(-)
----------------------------------------------------------------------