[2/2] karaf git commit: Merge branch 'karaf-4270-fallback-k40' of https://github.com/maggu2810/karaf into karaf-4.0.x

[jbonofre]

Merge branch 'karaf-4270-fallback-k40' of https://github.com/maggu2810/karaf 
into karaf-4.0.x


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

Branch: refs/heads/karaf-4.0.x
Commit: 6af688ebebd350a83b465c305de6d32fb145055b
Parents: bc343cc 085076e
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Wed Feb 17 14:49:10 2016 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Wed Feb 17 14:49:10 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/shell/compat/CommandTracker.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------