Merge remote branch 'upstream/master' into prv/po
[ikiwiki] / underlays / smiley /
2007-08-28  joey* Support for looking in multiple directories for under...