Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 30 Dec 2008 17:24:36 +0000 (18:24 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 30 Dec 2008 17:24:36 +0000 (18:24 +0100)
commit21add7ffa87a5e622d18bdbb24c638c15bdb3800
tree6780aa6dbee71f18db64e44b012e789fc8197d4b
parent3190e5cea75a43d38f58b8a45fbc87d5527d18f0
parent3032909090711c86c5056987043eeff5a1f6aec2
Merge commit 'upstream/master' into prv/po

Conflicts:

debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
IkiWiki/Plugin/parentlinks.pm
debian/control
debian/copyright