]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 19:49:08 +0000 (15:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 19:49:08 +0000 (15:49 -0400)

Trivial merge