]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Apr 2010 00:12:25 +0000 (20:12 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Apr 2010 00:12:25 +0000 (20:12 -0400)
commit4efc897fdfedeba55a55e82fd4b0145235281883
tree5a8f6b8d3e96164a2980b07d64e5f2d3f50a6a6d
parent142e025ae471c91e68a23476f700df0b8ad6b31d
parentb5e7f7a67f9893c7083afe3594c4a274c1b96062
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info