]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 23 Sep 2013 17:21:56 +0000 (13:21 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 23 Sep 2013 17:21:56 +0000 (13:21 -0400)
commit9ef8c8c47aec5f2218b42697760167b0eba6f8a3
treeb961e5870d04bf59d4ff2d94cc7be663ceb66b35
parent1e256b23b382a2ae95a4c7e2c18949bd69995e1a
parent19c1d2c3cd33ccdb1986c4bfbca81c04e059fcc7
Merge branch 'master' of ssh://git.ikiwiki.info