]> sipb.mit.edu Git - ikiwiki.git/commit
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)
commit10b857bb9b8cdece8d258d00492a6849ab7c06cb
tree0ce5fe8142653aa84923e10f4bdc5b0b9eb99937
parentda392e7ed171dd44f84203f40f6b7e2e99de729d
parentf8880cb670b0d1169559d04602fc543b1a6a061e
Merge commit 'f8880cb670b0d1169559d04602fc543b1a6a061e' into sipb

Conflicts:
templates/page.tmpl
IkiWiki/Plugin/parentlinks.pm
templates/page.tmpl