Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git...

diff --cc geekigeeki.py
index b8aeee89402cddc8bfe65b947e63c12d550cad27,faf59027217f4c59f0300d99c22f4a22f487e4b5..4d50a3af5c0fd4aa29c24ec1918e59f801a2d047
--- 1/geekigeeki.py
--- 2/geekigeeki.py
+++ b/geekigeeki.py
@@@ -216,13 -198,13 +216,13 @@@ def link_tag(params, text=None, link_cl
  
      return '<a %shref="%s">%s</a>' % (classattr, relative_url(params, privileged=privileged), text)
  
 -def link_inline(name, descr=None, args=''):
 -    if not descr: descr = name
 +def link_inline(name, descr=None, kvargs={}):
 +    if not descr: descr = humanlink(name)
      url = relative_url(name)
      if video_re.match(name):
-         return '<video src="%s">Your browser does not support the HTML5 video tag</video>' % url
+         return '<video controls="1" src="%s">Your browser does not support the HTML5 video tag</video>' % url
      elif img_re.match(name):
 -        return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + args, descr)
 +        return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
      elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
          return Page(name).send_naked()
      else: