]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'smcv/aggregateinternal' into aggregateinternal
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 15 Jul 2008 02:42:22 +0000 (22:42 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 15 Jul 2008 02:42:22 +0000 (22:42 -0400)
commit3256522bdaf2ca7c678041a19a4b97bd7dc57c90
treea9fdd3b36ea778766d1789a8cc740f7ed48909ed
parenta8daf61b7d3c38e95ba8a168cdba3dfbce750e16
parentb29d11b3c67533ca7addadb40a818a88cf6b8a84
Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

doc/plugins/aggregate.mdwn
doc/plugins/aggregate.mdwn
doc/todo/aggregate_to_internal_pages.mdwn