]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into staging
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:28:26 +0000 (10:28 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:28:26 +0000 (10:28 +0200)

Trivial merge