Disambiguate myself a bit (like that's needed).
debian: fix some wrong paths in the copyright file
Replace Verisign logo with one done in Inkscape Basically just U+2714 HEAVY CHECK MARK on a circle.
replace AOL logo with one done in Inkscape Their new logotype is really, really easy to imitate.
Replace Livejournal icon with something vaguely similar Drawn in Inkscape and released under the IkiWiki basewiki license.
Replace Wordpress icon with one taken from its Debian package I was unable to determine a specific author or copyright holder for this icon, and listing every potential Wordpress copyright holder in debian/copyright seems ridiculous.
Replace Google, Yahoo, Flickr icons with versions by Jakub Steiner Taken from gnome-online-accounts under LGPL-2.1+.
update copyright and changelog
more updates for trail merge
add osm plugin
updated debian copyright format url
add missing license text
jquery source cleanup * Add unminified jquery js and css files to source. * Update to jquery 1.6.2, and jquery-ui 1.8.14. The full files are included in the source but not the binary. I'm not minifying the files as part of build because I don't want ikiwiki to build depend on a javascript minifier. (Let alone need one at runtime). Nor do I want to deal with any breakage caused by the minifier. These files were taken from the debian packages. The jquery-tmpl full file was taken from revision 66bb852217c49ae8c9a8f2522150354ae80463de of its git repository, which matches the minified file I already had. I did not want to deal with possible breakage in newer versions; this thing claims to need an ancient version of jquery (1.4.2), and is perhaps only working by luck with the newer versions as it is.
added jquery templates
added jquery-ui for attachment interface
updated jquery and made it its own underlay
update copyright
Changed license of madduck's python plugins from GPL-2 to BSD-2-clause. Apparently the rst library is changing to a GPL-2 incompatable license. "madduck: joeyh: so yes, do as you think is right."
add paths to plugin files in copyright
transient merged; bookkeeping