]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 21:27:02 +0000 (16:27 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 21:27:02 +0000 (16:27 -0500)

Trivial merge