avoid merge conflicts when comments are posted to two branches of a
site.
* linkmap: Add option to omit disconnected pages from the map.
+ * inline: Fix bug that limited displayed pages when feedshow was
+ specified w/o show.
-- Joey Hess <joeyh@debian.org> Fri, 25 Dec 2009 14:31:22 -0500