]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 19 Apr 2010 20:04:49 +0000 (16:04 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 19 Apr 2010 20:04:49 +0000 (16:04 -0400)
commit7c0a2830f284d751798811245e92f87b13b564cb
tree1df68ed56d8adc64fbff05b3d4af5fe12ad6b3a9
parent1b7c455f4a4214bc9df766be4ec2b12adcf679e1
parent99cdd38dd54047d0e79dbf65d58ba11ee38f2c92
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info