]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote branch 'remotes/GiuseppeBilotta/master'
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 7 Jan 2010 20:10:57 +0000 (15:10 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 7 Jan 2010 20:10:57 +0000 (15:10 -0500)

Trivial merge