[06/19] git commit: Merge branch 'master' into jms_doc

[jbonofre]

Merge branch 'master' into jms_doc


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

Branch: refs/heads/master
Commit: 69ce8946b1e1f0d7ae5bdfcddb14997814cb0de1
Parents: e49e3e5 aed3b08
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Wed Dec 18 14:54:35 2013 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Wed Dec 18 14:54:35 2013 +0100

----------------------------------------------------------------------
 .../src/main/resources/OSGI-INF/blueprint/webconsole-features.xml   | 1 +
 .../gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml  | 1 +
 .../src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml   | 1 +
 3 files changed, 3 insertions(+)
----------------------------------------------------------------------