tree c1235280cb209959a583f96b4cd179c7e0011afc
parent 042e9ff39acff0a36cb896c1524aecbebfec9dad
parent 1be364914c0f641403e6f72607aa73488fe820ac
author Jean-Baptiste Onofré <jbonofre@apache.org> 1387371962 +0100
committer Jean-Baptiste Onofré <jbonofre@apache.org> 1387371962 +0100

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf-eik