Merge commit 'giskard/master'

diff --combined geekigeeki.py
index 83a8e8fb0a1fc48e2025cdb0f5778811f47a3a31,44b5131bb1435a0e2781f56a8583e108b52b0b75..317e9ca64a78e50649a3a2549b64a9ba201bc07c
--- 1/geekigeeki.py
--- 2/geekigeeki.py
+++ b/geekigeeki.py
@@@ -120,7 -120,7 +120,7 @@@ def send_guru(msg_text, msg_type)
      print(cgi.escape(msg_text))
      if msg_type == 'error':
          print '\n           Guru Meditation #DEADBEEF.ABADC0DE'
 -    print('</pre><script language="JavaScript" type="text/javascript" src="%s" defer="defer"></script>' \
 +    print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
          % relative_url('sys/GuruMeditation.js'))
  
  def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
@@@ -610,8 -610,8 +610,8 @@@ class WikiFormatter
                      print('</p><p>')
                  else:
                      indent = indent_re.match(self.line)
-                     #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
                      print(self._indent_to(len(indent.group(1)), indent.group(2)))
+                     # Stand back! Here we apply the monster regex that does all the parsing
                      print(re.sub(scan_re, self.replace, self.line))
  
          if self.in_pre: print('</pre>')
@@@ -664,7 -664,7 +664,7 @@@ class Page
          out = '== '
          pathname = ''
          for dirname in self.page_name.strip('/').split('/'):
-             pathname = (pathname + '/' + dirname) if pathname else dirname
+             pathname = (pathname and pathname + '/' ) + dirname
              out += '[[' + pathname + '|' + dirname + ']]/'
          out += ' ==\n'