Refactoring for Spray integration.
Update osgi.bnd
Refactoring for Spray integration.
Refactoring for Spray integration.
Refactoring for Spray integration.
Refactoring for Spray integration.
Merge branch 'spray'