# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1451778842 -3600
# Node ID 8de1cc117d891aa0deeadb80b1579d35bc08ef2e
# Parent  f6690e50793c26a65015066ff0f8a25cd8530a83# Parent  ff642c382b2b3e5e134a8862bb53ff01c480cffd
merge changes from default branch

diff -r f6690e50793c -r 8de1cc117d89 content/.htaccess
--- a/content/.htaccess	Sat Jan 02 12:59:49 2016 +0100
+++ b/content/.htaccess	Sun Jan 03 00:54:02 2016 +0100
@@ -3,4 +3,4 @@
 
 AddOutputFilterByType DEFLATE text/html text/css
 
-#Header set X-Pingback http://xanthippe.duckdns.org/pingback
+Header set X-Pingback http://xanthippe.duckdns.org/pingback