]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 20:33:29 +0000 (16:33 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 20:33:29 +0000 (16:33 -0400)
doc/sandbox/revert_me.mdwn

index d5fb065049e7edf54bca266eb2a9f6d9a03eb84b..2b1cd2f94b5da683ccf984792901545b743be9f5 100644 (file)
@@ -1,3 +1 @@
 this looks good
-
-ok