[3/3] [lang] Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang

2017-03-27 Thread pascalschumacher
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/30d4070a Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/30d4070a Diff:

[3/3] [lang] Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang

2015-06-24 Thread oheger
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang Conflicts: src/changes/changes.xml src/main/java/org/apache/commons/lang3/text/StrLookup.java Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos