Merge branch 'subtree'
[fanfix.git] / resources.properties