]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'smcv/aggregate' into aggregate
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 15:42:34 +0000 (11:42 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 15:42:34 +0000 (11:42 -0400)

Trivial merge