]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '21fe996544f43ad5cfcdf36388015971b7fc56d1' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:52:23 +0000 (00:52 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:52:23 +0000 (00:52 -0500)
commitb57db6cba28e8c89d7dfceb8ed1e898b5b093ef7
tree104a92241ade52be5f4d956420460a8e859eb209
parente0109e37d199bdb57eee65b014e974162c76cefe
parent21fe996544f43ad5cfcdf36388015971b7fc56d1
Merge commit '21fe996544f43ad5cfcdf36388015971b7fc56d1' into sipb

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