tree b36ce7bb8320237876d3b0ee8e566c6d7f811206
parent f7e18e37f6d148bd582e2690793fff385e72ae71
parent e1918a458310d0a678ac2ab3639d0b211efcd3d1
author jgoodyear <jgoodyear@apache.org> 1470082904 -0230
committer jgoodyear <jgoodyear@apache.org> 1470082904 -0230

Merge branch 'KARAF-4644-master' of https://github.com/jwcarman/karaf