]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote branch 'remotes/bzed/extendedlink'
authorJoey Hess <joey@kitenet.net>
Wed, 23 Jun 2010 17:30:14 +0000 (13:30 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 23 Jun 2010 17:30:14 +0000 (13:30 -0400)

Trivial merge