Merge remote branch 'remotes/GiuseppeBilotta/master'

diff --git a/doc/git.mdwn b/doc/git.mdwn
index d21a282e457e22750e97a9e3d0e30634cf58f030..5167ad0044cec22b24b060f3fcb7eb8d0540dda6 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -55,6 +55,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
 * [[tove]] `git://github.com/tove/ikiwiki.git`
+* [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
 
 
 ## branches

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index aa4b4b4e609b3d0d59c41adf30f16454dc30e38c..0ebab313d0d47168b9bb2d427a2913b039e2f85c 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -49,6 +49,7 @@ Projects & Organizations
 * [Tinc VPN](http://tinc-vpn.org/)
 * [The XCB library](http://xcb.freedesktop.org/)
 * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
+* [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
 
 Personal sites and blogs
 ========================

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e23c6330b9bba7e88b323cfe5f4d7643b5e1dc69..f1a6ed3b4cda6a5535e46ebf7103578c98964350 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -74,3 +74,4 @@ bar
 
 [[!toggle  id="foobar" text="foo/bar"]]
 
+Hmm, can I dig it?

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 62317ba1af687920fe5f0afd5c509527c4f70af5..99a9cf1e2b4d073fe37f75480090499810a547f4 100644 (file)
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -178,3 +178,8 @@ definitions essentially.
      * title
 
 -- [[Jon]]
+
+>>> Merry Christmas/festive season/happy new year folks. I've been away from
+>>> ikiwiki for the break, and now I've returned to watching recentchanges.
+>>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
+>>> you had a chance to look at this yet? -- [[Jon]]