]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 19:52:51 +0000 (15:52 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 19:52:51 +0000 (15:52 -0400)

Trivial merge