]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '1609da8f00e29c580e92fd1d3c2b093cbc41d20e' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:49:06 +0000 (00:49 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:49:06 +0000 (00:49 -0500)
commit3627f6f9ed4776a6f010f2e66b4ba9bda25c5932
tree367d603c111bd7fcc8cc50d32510f11804dcd6cd
parentb94cc84c742c67dc405c395cd22d868be8089aba
parent1609da8f00e29c580e92fd1d3c2b093cbc41d20e
Merge commit '1609da8f00e29c580e92fd1d3c2b093cbc41d20e' into sipb

Conflicts:
templates/page.tmpl
templates/editpage.tmpl