]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 02:59:06 +0000 (22:59 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 02:59:06 +0000 (22:59 -0400)
commit83dc7d257417944e52cd76bbfaf06090d47723e2
tree8231442d3ecf60758a8eb72558398b783a5c3485
parent2cd92fcb22166351193cc2b68d9c61744b480b36
parenta2feb7d477a57a4e7feb1334e7ff4abc4067b1d3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info