]> 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, 12 Nov 2010 15:06:50 +0000 (11:06 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 12 Nov 2010 15:06:50 +0000 (11:06 -0400)
commitf942c2db05e4da9188f36c5df1d42aea709208bf
tree790fb29ab76b10f7927f526aade55e383162498d
parent5f750e16b8c32d2fd69209f433e7d19efa53a71f
parentebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info