[2/2] karaf git commit: Merge branch 'master' of https://github.com/mhautman/karaf

[jbonofre]

Merge branch 'master' of https://github.com/mhautman/karaf


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

Branch: refs/heads/master
Commit: 6b9846657f92ee4bac5bd843ffdfd4d5672a2689
Parents: 6657400 fd2b1c3
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Thu Apr 14 16:51:47 2016 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Thu Apr 14 16:51:47 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/karaf/scr/command/ScrCommandConstants.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------