| commit | 2f7829d85edea18cb84de8a31c90a47153cfdcee | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Onofré <jbonofre@apache.org> | Tue Sep 29 16:09:26 2015 +0200 |
| committer | Jean-Baptiste Onofré <jbonofre@apache.org> | Tue Sep 29 16:09:26 2015 +0200 |
| tree | a626811958c9c007ef0e30d4625db1efa7906317 | |
| parent | 745ae5135e483d03026a6278fa2acabe86b12036 [diff] | |
| parent | d84d8703f4b2cbc036f7d4d01a6cc42ca19469d6 [diff] |
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x