Merge branch 'upstream' into subtree
[fanfix.git] / teditor / Line.java