]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:51:46 +0000 (16:51 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:51:46 +0000 (16:51 -0400)

Trivial merge