]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'f8880cb670b0d1169559d04602fc543b1a6a061e' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:42:15 +0000 (00:42 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:42:15 +0000 (00:42 -0500)
Conflicts:
templates/page.tmpl

1  2 
IkiWiki/Plugin/parentlinks.pm
templates/page.tmpl

Simple merge
Simple merge