]> 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>
Thu, 11 Mar 2010 20:44:16 +0000 (15:44 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Mar 2010 20:44:16 +0000 (15:44 -0500)

Trivial merge