]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '0aad1794ad27da6ab41001e335eba952c2e0ac88' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:31:51 +0000 (00:31 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:31:51 +0000 (00:31 -0500)
commit7e73e880e23c6832b378c8139d65d309544b83e8
tree0fdc0a9d2b2fa0942a61e034d487f8a167347f67
parent3ad2ae0d5c5b25dc20e834508ec355909007118c
parent0aad1794ad27da6ab41001e335eba952c2e0ac88
Merge commit '0aad1794ad27da6ab41001e335eba952c2e0ac88' into sipb

Conflicts:
templates/page.tmpl