Conflicts: templates/2k11/admin/entries.tpl templates/2k11/admin/serendipity_editor.js.tpl templates/2k11/admin/style.css