]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 24 Jul 2010 09:22:20 +0000 (05:22 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Jul 2010 09:22:20 +0000 (05:22 -0400)
commita47444fd97d73c756072abe655abf90b591defaa
treee2a68324dda4f26aae9ce1c61e72d78a24e97f76
parent855fad15e50217ea768768ad1a3a68bb9422eae1
parent11bd781a9dc8c04a005a04a99845ec339079b610
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info