]> 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 17:28:49 +0000 (13:28 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 17:28:49 +0000 (13:28 -0400)
commita45f31ae03dc97b27482a717b03f5f266efcf99e
tree5560e6783c38f0ff244a7182dccedbbbc192d258
parente779098796e18c11c43e9e38339577376ded8e2b
parent53c8bf9ed98f263163768daeb1d4e0fdbf6e7ef3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info