]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'd69f6057d1e1787fa3c19cc13c40eb3e9b822283' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:25:08 +0000 (00:25 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:25:08 +0000 (00:25 -0500)
commit3ad2ae0d5c5b25dc20e834508ec355909007118c
tree0fdc0a9d2b2fa0942a61e034d487f8a167347f67
parentcf079f627e370ee823f07604a9a42dccc59f2afd
parentd69f6057d1e1787fa3c19cc13c40eb3e9b822283
Merge commit 'd69f6057d1e1787fa3c19cc13c40eb3e9b822283' into sipb

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