]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 03:00:35 +0000 (23:00 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 03:00:35 +0000 (23:00 -0400)

Trivial merge