Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

2010-01-07 15:10:29 -05:00 · 2010-01-07 15:10:29 -05:00 · db44ee6ed0
parent a250a55baa 436e297310
commit db44ee6ed0
3 changed files with 7 additions and 0 deletions
--- 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
 ========================
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@ -74,3 +74,4 @@ bar

 [[!toggle  id="foobar" text="foo/bar"]]

+Hmm, can I dig it?
--- 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]]