]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge remote branch 'origin/debian-testing' into debian-testing
authorJoey Hess <joey@kitenet.net>
Sun, 5 Dec 2010 20:39:06 +0000 (16:39 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 5 Dec 2010 20:39:06 +0000 (16:39 -0400)

Trivial merge