modified:   Smarty-3.1.13/libs/SmartyBC.class.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.cat.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.count_characters.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.count_paragraphs.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.count_sentences.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.count_words.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.default.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.escape.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.from_charset.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.indent.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.lower.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.noprint.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.string_format.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.strip.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.strip_tags.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.to_charset.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.unescape.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.upper.php
	modified:   Smarty-3.1.13/libs/plugins/modifiercompiler.wordwrap.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_compile_break.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_compile_continue.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_compile_private_modifier.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_compile_private_registered_block.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_compile_private_registered_function.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_compile_setfilter.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_function_call_handler.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_get_include_path.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_nocache_insert.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_parsetree.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_resource_eval.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_templatebase.php
	modified:   Smarty-3.1.13/libs/sysplugins/smarty_internal_templatecompilerbase.php
	new file:   awstats/awstats062013.www.n-ve.be.txt
	new file:   awstats/dnscachelastupdate.www.n-ve.be.txt
	new file:   awstats/index.html
	new file:   classes/.cshrc
	modified:   classes/article.php
	modified:   classes/blog.php
	new file:   classes/config.php
	new file:   classes/connection.php
	modified:   classes/controller.php
	modified:   classes/request.php
	modified:   classes/session.php
	modified:   classes/user.php
	modified:   config.php
	modified:   css/SyntaxHighlighter.css
	modified:   css/article.css
	modified:   css/style.css
	new file:   css/style.css~
	new file:   error/401-authorization.html
	new file:   error/403-forbidden.html
	new file:   error/404-file-not-found.html
	new file:   error/500-internal-server-error.html
	new file:   ie.html
	new file:   images/article/house.png
	new file:   images/article/misanthrope.jpg
	new file:   images/article/password.jpg
	new file:   images/article/smiley.jpg
	new file:   images/article/smiley.png
	new file:   images/bg.png
	new file:   images/browsers/chrome.jpg
	new file:   images/browsers/chrome.png
	new file:   images/browsers/firefox.png
	new file:   images/browsers/opera.png
	new file:   images/category/philosophy.jpg
	new file:   images/category/philosophy.png
	new file:   images/facebook_share.png
	new file:   images/header.gif
	modified:   images/header.jpg
	new file:   images/header.png
	new file:   images/menu.gif
	new file:   images/quotes.png
	new file:   images/quotes_down.png
	new file:   images/quotes_up.png
	new file:   images/templatemo_header_bg.gif
	modified:   smarty/templates_c/672fd9af655c60d2c163b7a416c92c187a853cd1.file.page.tpl.php
	modified:   smarty/templates_c/6de9a4064f4da6963a692bdfa4c7cc5a6d72eb82.file.editor.tpl.php
	modified:   smarty/templates_c/7219aedfef46ca98be08e95f488def87265787a5.file.head.tpl.php
	modified:   smarty/templates_c/81a0270564c79ee7a1c4f40d2a5e8bcfac7e3570.file.login.tpl.php
	new file:   smarty/templates_c/8427b5bc72b98ce173fdad05f5c4d8ef161cca1f.file.article.tpl.php
	modified:   smarty/templates_c/85296728504fc4c9600ebb404f2492cf1e20a9fa.file.article.tpl.php
	new file:   smarty/templates_c/882e32e7dd669e156f6ce630b0edc045ec3d9225.file.editor.tpl.php
	modified:   smarty/templates_c/9206ffe216f3f7c2e7655782292928f7d20e8be5.file.footer.tpl.php
	new file:   smarty/templates_c/ab1a1b5979c727286620744065f77463e754cb86.file.page.tpl.php
	modified:   smarty/templates_c/be439f82a4dbec61746f62a0df07c19a7eecd966.file.header.tpl.php
	modified:   smarty/templates_c/e957eae74301a500b7818a21e98d7ad3cc63c2d9.file.side.tpl.php
	modified:   smarty/templates_c/f0f109d05c64df629f4e796edc308cec65bb638f.file.page.tpl.php
	new file:   templates/article.php
	modified:   templates/article.tpl
	new file:   templates/blog.php
	new file:   templates/controller.php
	modified:   templates/editor.tpl
	modified:   templates/head.tpl
	modified:   templates/header.tpl
	modified:   templates/login.tpl
	modified:   templates/page.tpl
	modified:   templates/side.tpl
Merge branch 'master' of github.com:niels07/nve

Conflicts:
	config.php

	deleted:    config.php