merge branches/2.5 into trunk
[debian/jabref.git] / src / resource / fields / .cvsignore
1 fields.xml~