Merge branch 'master' of git://github.com/s9y/Serendipity

Conflicts:
	bundled-libs/Smarty/README
	bundled-libs/Smarty/SMARTY_3.1_NOTES.txt
	bundled-libs/Smarty/change_log.txt
	bundled-libs/Smarty/libs/Smarty.class.php
	bundled-libs/Smarty/libs/SmartyBC.class.php
	bundled-libs/Smarty/libs/plugins/block.textformat.php
	bundled-libs/Smarty/libs/plugins/function.counter.php
	bundled-libs/Smarty/libs/plugins/function.cycle.php
	bundled-libs/Smarty/libs/plugins/function.fetch.php
	bundled-libs/Smarty/libs/plugins/function.html_checkboxes.php
	bundled-libs/Smarty/libs/plugins/function.html_image.php
	bundled-libs/Smarty/libs/plugins/function.html_options.php
	bundled-libs/Smarty/libs/plugins/function.html_radios.php
	bundled-libs/Smarty/libs/plugins/function.html_select_date.php
	bundled-libs/Smarty/libs/plugins/function.html_select_time.php
	bundled-libs/Smarty/libs/plugins/function.html_table.php
	bundled-libs/Smarty/libs/plugins/function.mailto.php
	bundled-libs/Smarty/libs/plugins/function.math.php
	bundled-libs/Smarty/libs/plugins/modifier.capitalize.php
	bundled-libs/Smarty/libs/plugins/modifier.date_format.php
	bundled-libs/Smarty/libs/plugins/modifier.debug_print_var.php
	bundled-libs/Smarty/libs/plugins/modifier.escape.php
	bundled-libs/Smarty/libs/plugins/modifier.regex_replace.php
	bundled-libs/Smarty/libs/plugins/modifier.replace.php
	bundled-libs/Smarty/libs/plugins/modifier.spacify.php
	bundled-libs/Smarty/libs/plugins/modifier.truncate.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.cat.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.count_characters.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.count_paragraphs.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.count_sentences.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.count_words.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.default.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.escape.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.from_charset.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.indent.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.lower.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.noprint.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.string_format.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.strip.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.strip_tags.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.to_charset.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.unescape.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.upper.php
	bundled-libs/Smarty/libs/plugins/modifiercompiler.wordwrap.php
	bundled-libs/Smarty/libs/plugins/outputfilter.trimwhitespace.php
	bundled-libs/Smarty/libs/plugins/shared.escape_special_chars.php
	bundled-libs/Smarty/libs/plugins/shared.literal_compiler_param.php
	bundled-libs/Smarty/libs/plugins/shared.make_timestamp.php
	bundled-libs/Smarty/libs/plugins/shared.mb_str_replace.php
	bundled-libs/Smarty/libs/plugins/shared.mb_unicode.php
	bundled-libs/Smarty/libs/plugins/shared.mb_wordwrap.php
	bundled-libs/Smarty/libs/plugins/variablefilter.htmlspecialchars.php
	bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource.php
	bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource_custom.php
	bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
	bundled-libs/Smarty/libs/sysplugins/smarty_config_source.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_append.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_assign.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_block.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_break.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_call.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_capture.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_debug.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_eval.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_extends.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_for.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_function.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_if.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_include.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_insert.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_section.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_while.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_compilebase.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_config.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfileparser.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_data.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_debug.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_filter_handler.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_function_call_handler.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_get_include_path.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_parsetree.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_eval.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_extends.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_file.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_php.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_registered.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_stream.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_resource_string.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_template.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatebase.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_templateparser.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_utility.php
	bundled-libs/Smarty/libs/sysplugins/smarty_internal_write_file.php
	bundled-libs/Smarty/libs/sysplugins/smarty_resource.php
	bundled-libs/Smarty/libs/sysplugins/smarty_resource_custom.php
	bundled-libs/Smarty/libs/sysplugins/smarty_resource_recompiled.php
	bundled-libs/Smarty/libs/sysplugins/smarty_resource_uncompiled.php
	bundled-libs/Smarty/libs/sysplugins/smarty_security.php
	htmlarea/plugins/ImageManager/Classes/NetPBM.php
	include/admin/importers/blogger.inc.php
	include/admin/importers/nuke.inc.php
	include/admin/importers/smf.inc.php
	include/admin/importers/wordpress-pg.inc.php
	include/functions_config.inc.php
	include/functions_entries.inc.php
	include/functions_smarty.inc.php
	include/plugin_api.inc.php
	include/serendipity_smarty_class.inc.php
	lang/UTF-8/serendipity_lang_cs.inc.php
	lang/UTF-8/serendipity_lang_cz.inc.php
	plugins/serendipity_event_bbcode/UTF-8/lang_bg.inc.php
	plugins/serendipity_event_bbcode/UTF-8/lang_de.inc.php
	plugins/serendipity_event_bbcode/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_bbcode/lang_bg.inc.php
	plugins/serendipity_event_bbcode/lang_de.inc.php
	plugins/serendipity_event_bbcode/lang_fa.inc.php
	plugins/serendipity_event_bbcode/lang_tn.inc.php
	plugins/serendipity_event_contentrewrite/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_contentrewrite/lang_tn.inc.php
	plugins/serendipity_event_creativecommons/ChangeLog
	plugins/serendipity_event_creativecommons/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_creativecommons/lang_tn.inc.php
	plugins/serendipity_event_emoticate/UTF-8/lang_se.inc.php
	plugins/serendipity_event_emoticate/lang_se.inc.php
	plugins/serendipity_event_entryproperties/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_entryproperties/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_entryproperties/UTF-8/lang_de.inc.php
	plugins/serendipity_event_entryproperties/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_entryproperties/lang_cs.inc.php
	plugins/serendipity_event_entryproperties/lang_cz.inc.php
	plugins/serendipity_event_entryproperties/lang_de.inc.php
	plugins/serendipity_event_entryproperties/lang_tn.inc.php
	plugins/serendipity_event_karma/ChangeLog
	plugins/serendipity_event_karma/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_karma/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_karma/UTF-8/lang_de.inc.php
	plugins/serendipity_event_karma/UTF-8/lang_ru.inc.php
	plugins/serendipity_event_karma/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_karma/lang_cs.inc.php
	plugins/serendipity_event_karma/lang_cz.inc.php
	plugins/serendipity_event_karma/lang_de.inc.php
	plugins/serendipity_event_karma/lang_fa.inc.php
	plugins/serendipity_event_karma/lang_ru.inc.php
	plugins/serendipity_event_karma/lang_tn.inc.php
	plugins/serendipity_event_livesearch/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_livesearch/lang_tn.inc.php
	plugins/serendipity_event_mailer/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_mailer/lang_tn.inc.php
	plugins/serendipity_event_nl2br/UTF-8/lang_bg.inc.php
	plugins/serendipity_event_nl2br/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_nl2br/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_nl2br/UTF-8/lang_de.inc.php
	plugins/serendipity_event_nl2br/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_nl2br/lang_bg.inc.php
	plugins/serendipity_event_nl2br/lang_cs.inc.php
	plugins/serendipity_event_nl2br/lang_cz.inc.php
	plugins/serendipity_event_nl2br/lang_de.inc.php
	plugins/serendipity_event_nl2br/lang_en.inc.php
	plugins/serendipity_event_nl2br/lang_tn.inc.php
	plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
	plugins/serendipity_event_s9ymarkup/UTF-8/lang_bg.inc.php
	plugins/serendipity_event_s9ymarkup/UTF-8/lang_se.inc.php
	plugins/serendipity_event_s9ymarkup/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_s9ymarkup/lang_bg.inc.php
	plugins/serendipity_event_s9ymarkup/lang_se.inc.php
	plugins/serendipity_event_s9ymarkup/lang_tn.inc.php
	plugins/serendipity_event_searchhighlight/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_searchhighlight/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_searchhighlight/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_searchhighlight/lang_cs.inc.php
	plugins/serendipity_event_searchhighlight/lang_cz.inc.php
	plugins/serendipity_event_searchhighlight/lang_tn.inc.php
	plugins/serendipity_event_spamblock/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_spamblock/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_spamblock/UTF-8/lang_de.inc.php
	plugins/serendipity_event_spamblock/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_spamblock/lang_cs.inc.php
	plugins/serendipity_event_spamblock/lang_cz.inc.php
	plugins/serendipity_event_spamblock/lang_de.inc.php
	plugins/serendipity_event_spamblock/lang_fa.inc.php
	plugins/serendipity_event_spamblock/lang_tn.inc.php
	plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
	plugins/serendipity_event_spartacus/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_spartacus/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_spartacus/UTF-8/lang_de.inc.php
	plugins/serendipity_event_spartacus/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_spartacus/lang_cs.inc.php
	plugins/serendipity_event_spartacus/lang_cz.inc.php
	plugins/serendipity_event_spartacus/lang_de.inc.php
	plugins/serendipity_event_spartacus/lang_tn.inc.php
	plugins/serendipity_event_statistics/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_statistics/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_statistics/UTF-8/lang_de.inc.php
	plugins/serendipity_event_statistics/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_statistics/lang_cs.inc.php
	plugins/serendipity_event_statistics/lang_de.inc.php
	plugins/serendipity_event_statistics/lang_tn.inc.php
	plugins/serendipity_event_templatechooser/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_templatechooser/lang_tn.inc.php
	plugins/serendipity_event_textile/UTF-8/lang_de.inc.php
	plugins/serendipity_event_textile/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_textile/lang_de.inc.php
	plugins/serendipity_event_textile/lang_tn.inc.php
	plugins/serendipity_event_textwiki/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_textwiki/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_textwiki/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_textwiki/lang_cs.inc.php
	plugins/serendipity_event_textwiki/lang_cz.inc.php
	plugins/serendipity_event_textwiki/lang_tn.inc.php
	plugins/serendipity_event_trackexits/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_trackexits/lang_tn.inc.php
	plugins/serendipity_event_weblogping/UTF-8/lang_de.inc.php
	plugins/serendipity_event_weblogping/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_weblogping/lang_de.inc.php
	plugins/serendipity_event_weblogping/lang_tn.inc.php
	plugins/serendipity_event_weblogping/servicesdb_tn.inc.php
	plugins/serendipity_event_xhtmlcleanup/UTF-8/lang_bg.inc.php
	plugins/serendipity_event_xhtmlcleanup/UTF-8/lang_cs.inc.php
	plugins/serendipity_event_xhtmlcleanup/UTF-8/lang_cz.inc.php
	plugins/serendipity_event_xhtmlcleanup/UTF-8/lang_de.inc.php
	plugins/serendipity_event_xhtmlcleanup/UTF-8/lang_tn.inc.php
	plugins/serendipity_event_xhtmlcleanup/lang_bg.inc.php
	plugins/serendipity_event_xhtmlcleanup/lang_cs.inc.php
	plugins/serendipity_event_xhtmlcleanup/lang_cz.inc.php
	plugins/serendipity_event_xhtmlcleanup/lang_de.inc.php
	plugins/serendipity_event_xhtmlcleanup/lang_tn.inc.php
	plugins/serendipity_plugin_comments/UTF-8/lang_bg.inc.php
	plugins/serendipity_plugin_comments/UTF-8/lang_de.inc.php
	plugins/serendipity_plugin_comments/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_comments/UTF-8/lang_tr.inc.php
	plugins/serendipity_plugin_comments/lang_bg.inc.php
	plugins/serendipity_plugin_comments/lang_de.inc.php
	plugins/serendipity_plugin_comments/lang_tn.inc.php
	plugins/serendipity_plugin_comments/lang_tr.inc.php
	plugins/serendipity_plugin_creativecommons/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_creativecommons/lang_tn.inc.php
	plugins/serendipity_plugin_entrylinks/UTF-8/lang_bg.inc.php
	plugins/serendipity_plugin_entrylinks/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_entrylinks/UTF-8/lang_tr.inc.php
	plugins/serendipity_plugin_entrylinks/lang_bg.inc.php
	plugins/serendipity_plugin_entrylinks/lang_tn.inc.php
	plugins/serendipity_plugin_entrylinks/lang_tr.inc.php
	plugins/serendipity_plugin_eventwrapper/UTF-8/lang_bg.inc.php
	plugins/serendipity_plugin_eventwrapper/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_eventwrapper/lang_bg.inc.php
	plugins/serendipity_plugin_eventwrapper/lang_tn.inc.php
	plugins/serendipity_plugin_history/UTF-8/lang_bg.inc.php
	plugins/serendipity_plugin_history/UTF-8/lang_de.inc.php
	plugins/serendipity_plugin_history/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_history/lang_bg.inc.php
	plugins/serendipity_plugin_history/lang_de.inc.php
	plugins/serendipity_plugin_history/lang_tn.inc.php
	plugins/serendipity_plugin_recententries/UTF-8/lang_bg.inc.php
	plugins/serendipity_plugin_recententries/UTF-8/lang_de.inc.php
	plugins/serendipity_plugin_recententries/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_recententries/UTF-8/lang_tr.inc.php
	plugins/serendipity_plugin_recententries/lang_bg.inc.php
	plugins/serendipity_plugin_recententries/lang_de.inc.php
	plugins/serendipity_plugin_recententries/lang_fa.inc.php
	plugins/serendipity_plugin_recententries/lang_tn.inc.php
	plugins/serendipity_plugin_recententries/lang_tr.inc.php
	plugins/serendipity_plugin_remoterss/UTF-8/lang_cs.inc.php
	plugins/serendipity_plugin_remoterss/UTF-8/lang_cz.inc.php
	plugins/serendipity_plugin_remoterss/UTF-8/lang_de.inc.php
	plugins/serendipity_plugin_remoterss/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_remoterss/lang_cs.inc.php
	plugins/serendipity_plugin_remoterss/lang_cz.inc.php
	plugins/serendipity_plugin_remoterss/lang_de.inc.php
	plugins/serendipity_plugin_remoterss/lang_tn.inc.php
	plugins/serendipity_plugin_shoutbox/UTF-8/lang_cs.inc.php
	plugins/serendipity_plugin_shoutbox/UTF-8/lang_cz.inc.php
	plugins/serendipity_plugin_shoutbox/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_shoutbox/lang_cs.inc.php
	plugins/serendipity_plugin_shoutbox/lang_cz.inc.php
	plugins/serendipity_plugin_shoutbox/lang_tn.inc.php
	plugins/serendipity_plugin_templatedropdown/UTF-8/lang_bg.inc.php
	plugins/serendipity_plugin_templatedropdown/UTF-8/lang_tn.inc.php
	plugins/serendipity_plugin_templatedropdown/lang_bg.inc.php
	plugins/serendipity_plugin_templatedropdown/lang_tn.inc.php
	templates/bulletproof/UTF-8/lang_cs.inc.php
	templates/bulletproof/UTF-8/lang_cz.inc.php
	templates/bulletproof/config.inc.php
	templates/bulletproof/lang_cs.inc.php
	templates/bulletproof/lang_cz.inc.php
	templates/default/admin/entries.tpl
	templates/kubrick/UTF-8/lang_cs.inc.php
	templates/kubrick/UTF-8/lang_cz.inc.php
	templates/kubrick/lang_cs.inc.php
	templates/kubrick/lang_cz.inc.php