Merge branch 'master' of /home/wking/notes/ikiwiki
authorW. Trevor King <wking@drexel.edu>
Sat, 14 May 2011 12:52:05 +0000 (08:52 -0400)
committerW. Trevor King <wking@drexel.edu>
Sat, 14 May 2011 12:52:05 +0000 (08:52 -0400)

Trivial merge