]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 17 Jul 2010 17:25:03 +0000 (13:25 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 17 Jul 2010 17:25:03 +0000 (13:25 -0400)
commitc9dd98cf945385b8a802e5f9d0ffb4041251c9fa
treea392dc3bd5bc9e958d6c42cac5487661800e280d
parent41423084295f4b694cdb0ec208ea0a1807dc8a62
parentdf925b72fefdcfdf975f4d0fe2e2a36916940704
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info