]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master'
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jul 2008 17:17:12 +0000 (13:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jul 2008 17:18:10 +0000 (13:18 -0400)
commitde468ba12dfc0891145b3f8b432eb97b70b60c0c
tree45a0009e31ea040d24349606fd6b12a95a57e2ee
parentaa67a17336e2ac5ecfa5fa17c2bcfaff08722de9
parentdaa8c8e44bb3fe0c6eb66b8e2c0faa1547bceeac
Merge branch 'master'