Merge branch 'master' into subtree
[nikiroo-utils.git] / reader / TextOutput.java