]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 19:01:02 +0000 (15:01 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 19:01:02 +0000 (15:01 -0400)

Trivial merge