]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 24 Nov 2014 15:25:40 +0000 (11:25 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 24 Nov 2014 15:25:40 +0000 (11:25 -0400)
commit509370d91ddc4871a60d48dc1dbd95e9a2eaff48
treef45ad7eb97382d02115efe2b2a206250465b1e73
parent3949e54c1a96aa33db44b9511f17ed4735d54ec7
parentfdf82ec00cc7463f87cba572f7d352f55912f8e1
Merge branch 'master' of ssh://git.ikiwiki.info