]> 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, 17 May 2010 17:13:43 +0000 (13:13 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 17 May 2010 17:13:43 +0000 (13:13 -0400)
commit92fa3f63d474a98e5f734c0cad432c9f3136c31c
tree3f0ba187d2e1616d95a44cf0ce7cf724f93c699e
parent4de7cdf2aaa7f35a33178da23e793e79ff073225
parent4518fbe1c101ed3a4a70d6c569ee0b5e0573835e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info