[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

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/0469103b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0469103b Diff: http://git-wip-us.ap

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

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/d1e3d022 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d1e3d022 Diff: http://git-wip-us.ap

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

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.ap

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

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/7f39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/7f39 Diff: http://git-wip-us.ap

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

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/5d1a1fa1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/5d1a1fa1 Diff: http://git-wip-us.ap

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master' Conflicts: api/src/main/java/org/apache/tamaya/ConfigFunctions.java Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1c11c0f0 Tree: http://git-wip-us.a