]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 29 Aug 2009 18:01:03 +0000 (14:01 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 29 Aug 2009 18:01:03 +0000 (14:01 -0400)

Trivial merge