]> 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, 21 Feb 2011 18:57:24 +0000 (14:57 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 21 Feb 2011 18:57:24 +0000 (14:57 -0400)
commit894d5712fad38677d605a7e63ca731880e6d5f6e
treeabd2a32fcb34ebf33b992ae610ec19d71be1f0e7
parent04498cdeb486a518ef9ed2464cb95f734b48c6bd
parentd872e2977db984286deadb378429cd697f69cde1
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info