]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 29 Aug 2008 17:21:25 +0000 (13:21 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 29 Aug 2008 17:21:25 +0000 (13:21 -0400)

Trivial merge