]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 3 Feb 2011 16:51:15 +0000 (12:51 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 3 Feb 2011 16:51:15 +0000 (12:51 -0400)
commit4c09742b169bf9b33da556f32034d21261aebf49
tree2aa25726b279db9e96c4a966c0976570e956120e
parent8e604c0f0af37c528f7d82540a891d26926c9938
parentdf20a3099daebd348d75498413d23db16cda77d8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info