]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'f52f395437a946478da2a126015c05e3e0afdc1f' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:37:54 +0000 (00:37 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:37:54 +0000 (00:37 -0500)
commit7db6066d3dc37db733680bdf9feb655dff23dc37
treeac3873d74eb1251b98ffddb23a98015b2116109c
parent05e2a673a893b06de4ea0abc6b18f532367b1560
parentf52f395437a946478da2a126015c05e3e0afdc1f
Merge commit 'f52f395437a946478da2a126015c05e3e0afdc1f' into sipb

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