]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 18:13:24 +0000 (14:13 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 18:13:24 +0000 (14:13 -0400)
commit45bd60365252954c31e688ce8207045730744e00
treee27f3981f23fad166f9d7cb4f43d1529a8720c64
parentbbce8b15ccfccbc3bfb0a8e231649fa3870e706b
parentdfbe3ce2e9783ed2e447da375b4c78936b670475
Merge branch 'master' of ssh://git.ikiwiki.info