Merge commit 'upstream/master' into prv/po
[ikiwiki] / underlays / basewiki / ikiwiki / directive.mdwn
2008-08-25  Joey HessMerge branch 'master' of ssh://git.ikiwiki.info/srv...
2008-08-25  Joey Hessrename preprocessordirective to directive