]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'ee9a4e06fcce53062b38814707a0b7d6946d4a36' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:40:47 +0000 (00:40 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:40:47 +0000 (00:40 -0500)
commitda392e7ed171dd44f84203f40f6b7e2e99de729d
tree8b33554b851b792c513eb7eb272344423fa0725d
parent7db6066d3dc37db733680bdf9feb655dff23dc37
parentee9a4e06fcce53062b38814707a0b7d6946d4a36
Merge commit 'ee9a4e06fcce53062b38814707a0b7d6946d4a36' into sipb

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