Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4b001504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4b001504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4b001504 Branch: refs/heads/master Commit: 4b0015048f519b6111586c415a93cceb95157d27 Parents: 3a0bf17 5bd97c9 Author: anatole <anat...@apache.org> Authored: Mon Jan 5 10:13:51 2015 +0100 Committer: anatole <anat...@apache.org> Committed: Mon Jan 5 10:13:51 2015 +0100 ---------------------------------------------------------------------- .../org/apache/tamaya/core/internal/PropertyConverterManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------