Merge commit 'baaa848f6c06b0b3a59677d3551e130c65e5fde7' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:19:59 +0000 (00:19 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:19:59 +0000 (00:19 -0500)
commit8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c
treec248a458ad86c540a9b5a7eabe07fcda4a08618c
parent3be4e72f3843154ec22a8dd4ff2c24e35f39f1d7
parentbaaa848f6c06b0b3a59677d3551e130c65e5fde7
Merge commit 'baaa848f6c06b0b3a59677d3551e130c65e5fde7' into sipb

Conflicts:
templates/page.tmpl
IkiWiki/Wrapper.pm
templates/page.tmpl