]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 29 Dec 2010 17:08:18 +0000 (13:08 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 29 Dec 2010 17:08:18 +0000 (13:08 -0400)
commit468c1c4496eade7a1a4ff6fe22aa82f5eefd3164
tree00bd4a95eead4f981acec81e37ec6cf8d2dcea2a
parent1c430def77b81caaee1fe05299d141b04051e62a
parent0d9da41b6be64d9d5bd192e918fd89a1742fe7d0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info