]> 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>
Mon, 24 Jan 2011 20:32:29 +0000 (16:32 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 24 Jan 2011 20:32:29 +0000 (16:32 -0400)
commitbb8303dc87a859066eb910388c296c44a970d346
tree423ffccbdb304677641ba1dc1ae6334ffa2084a8
parentc1c69db7498e247e249a2712dbeed39a6bdfaa0c
parent295a08394f1f962459d26db06624ff5d17bc3008
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info