Merge branch 'master' into subtree
[nikiroo-utils.git] / bundles / Config.java