From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 Feb 2014 15:59:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/00016e0006d1cc32769855cb60ea7cf279ed7ec0?hp=809a2765461a03b1b2583f0c7ae9d0097df9ca3d

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

diff --git a/doc/plugins/contrib/nimble.mdwn b/doc/plugins/contrib/nimble.mdwn
new file mode 100644
index 000000000..29e2686e9
--- /dev/null
+++ b/doc/plugins/contrib/nimble.mdwn
@@ -0,0 +1,6 @@
+[[!template id=plugin name=nimble author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/nimble author="[[schmonz]]"]]
+[[!tag type/format]]
+
+This plugin lets ikiwiki convert [Nimble](http://was.tl/projects/nimble/)
+to HTML.
diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn
index 00afb82fd..f379edee8 100644
--- a/doc/todo/support_linking_to_cgit.mdwn
+++ b/doc/todo/support_linking_to_cgit.mdwn
@@ -25,6 +25,8 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`?
 >>> for the Git plugin. Please review and merge if you like
 >>> it. --[[intrigeri]]
 
+>>>> Ping? --[[intrigeri]]
+
 [[wishlist]]
 
 [[!tag patch]]