Merge commit 'smcv/ready/getsource'

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 50bb0b9459e1792eb9bc8e45491f436c868bdec5,90ec2ddac36af8acaa4d0d765d39534c530debf6..e370a33ef3112483ac61be0af4039a71e714f758
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -8,14 -8,7 +8,15 @@@ ikiwiki (3.15) UNRELEASED; urgency=lo
    * Add further build machinery to generate translated underlays from
      the po file, for use by wikis whose primary language is not English.
    * Add Danish basewiki translation by Jonas Smedegaard.
 +  * img: Fix adding of dependency from page to the image.
 +  * pagestats: add `among` parameter, which only counts links from specified
 +    pages (smcv)
 +  * pagestats: when making a tag cloud, don't emit links where the tag is
 +    unused (smcv)
 +  * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm)
 +  * inline: Add pagenames parameter that can be used to list a set of
 +    pages to inline, in a specific order, without using a PageSpec. (smcv)
+   * Add getsource plugin (Will, smcv)
  
   -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
  

diff --cc doc/todo/source_link.mdwn
Simple merge