]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into po
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 22:52:32 +0000 (17:52 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 22:52:32 +0000 (17:52 -0500)

Trivial merge