]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'jelmer/master'
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 19:15:39 +0000 (15:15 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 19:15:39 +0000 (15:15 -0400)

Trivial merge