Merge branch 'master' of voker57@bitcheese.net:/var/gits/bwiki
Merged: 6b01a8509c0d6358797881e75a3c6ad1ff94be2d 01626e5caad2e1023a357b87d92e16039ad0bb60
-- a/wtf++ b/wtf
@@ -6,6 +6,8 @@
h4. wtf
h2. wtf too
Here's a stupid link: [http://wtf.hz].
slm.