Merge branch 'master' of https://github.com/jitsi/jitsi

lib/felix.client.run.properties

@@ -29,13 +29,16 @@ org.osgi.framework.system.packages.extra= \
 
 felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
 
+#slf4j-jdk is an OSGi fragment, so install but don't start it
+felix.auto.install.10= \
+ reference:file:sc-bundles/slf4j-jdk14.jar
+
 felix.auto.start.10= \
  reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
  reference:file:sc-bundles/bouncycastle.jar \
  reference:file:sc-bundles/bccontrib.jar \
  reference:file:sc-bundles/commons-lang.jar \
  reference:file:sc-bundles/guava.jar \
- reference:file:sc-bundles/slf4j-jdk14.jar \
  reference:file:sc-bundles/slf4j-api.jar
  
 # file:lib/bundle/shell.jar \