]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'smcv/master'
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)

Trivial merge