]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 25 Jul 2010 17:07:30 +0000 (13:07 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 25 Jul 2010 17:07:30 +0000 (13:07 -0400)
commit170e930f9d29039a4f8d385ec3bd9850c1cf95fa
tree96b09288346051473dc99ed2cb3258f85a340f5a
parentcba6935f55f95b99a177d2cbe9130d6d589e10a8
parent2860a34dc42dd9ed28f50833a8da124b94d8596a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info