]> scripts.mit.edu Git - www/ikiwiki.git/commitdiff
Merge branch 'master' into transitive-dependencies
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:28:57 +0000 (16:28 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:28:57 +0000 (16:28 -0400)

Trivial merge