]> 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>
Tue, 1 Mar 2011 16:39:08 +0000 (12:39 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 1 Mar 2011 16:39:08 +0000 (12:39 -0400)
commit9d3467cf4ac8773589a90a9b28e1e726dc417e6d
tree4ec10b581cf8794ebbea06e81cc4ea64f4a6c548
parent2a2ae88c84da1793fc927b527927fe1c5ae6a7d6
parentb156dbdcc25aa5f1e8124d0ae14d9aa75835b606
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info