# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1451701092 -3600
# Node ID 6e8d97e43bd7a9b9191dc0c64200b44c8fbd51bd
# Parent  82ccd2b150af957bca63b77f4407f919b5b94e58# Parent  35dc7a0b00eb38d118982c58201ef93cb871c272
Automated merge with ssh://xanthippe//home/dirk/Projekte/Blog

diff -r 35dc7a0b00eb -r 6e8d97e43bd7 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/reply2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/reply2	Sat Jan 02 03:18:12 2016 +0100
@@ -0,0 +1,5 @@
+Author: Nkolay Dimitrov
+Date: 2015-10-31 22:13:37
+
+Thank you very much for this comment! It really helped me work around this issue.
+
diff -r 35dc7a0b00eb -r 6e8d97e43bd7 content/pingback-test.md
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/pingback-test.md	Sat Jan 02 03:18:12 2016 +0100
@@ -0,0 +1,8 @@
+Title: pingback test
+Date: 2015-02-26
+Lang: en
+Status: draft
+
+This is a test that references [the test blog on wordpress](https://dirkstestblog.wordpress.com/2015/02/26/test-1/).
+
+Let's see if this works.
diff -r 35dc7a0b00eb -r 6e8d97e43bd7 staged_content/suspend-to-disk-gentoo.md
--- a/staged_content/suspend-to-disk-gentoo.md	Thu Oct 15 02:23:02 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-Title: Suspend to disk with a swapfile on Gentoo
-Date: 2014-09-01
-Lang: en
-
-Links:
-[Gentoo's wiki page on a custom initramfs](http://wiki.gentoo.org/wiki/Custom_Initramfs)
-[Entry on the Ubuntu forums that explains how to setup hibernate with a swap file](http://ubuntuforums.org/showthread.php?t=1042946)
-[Slackware documentation on hibernate with a swapfile](http://docs.slackware.com/howtos:slackware_admin:swapfile_hibernation)
-https://raw.githubusercontent.com/alonbl/gentoo-wiki-alonbl/master/wiki/Userspace_software_suspend.wiki
-http://forums.gentoo.org/viewtopic-t-960952-highlight-hibernate+swapfile.html