Merge branch 'master' of /home/wking/notes/ikiwiki
authorW. Trevor King <wking@drexel.edu>
Sat, 28 Aug 2010 03:09:34 +0000 (23:09 -0400)
committerW. Trevor King <wking@drexel.edu>
Sat, 28 Aug 2010 03:09:34 +0000 (23:09 -0400)

Trivial merge