]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '492c61f825ed792b2bd839b76777454d4102ca8c' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:48:31 +0000 (00:48 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:48:31 +0000 (00:48 -0500)
commitb94cc84c742c67dc405c395cd22d868be8089aba
tree953480453c78af4e238453f826ce2982cd702a48
parentc0c0068a0308884dc41921157d672c62eef9e83d
parent492c61f825ed792b2bd839b76777454d4102ca8c
Merge commit '492c61f825ed792b2bd839b76777454d4102ca8c' into sipb

Conflicts:
templates/page.tmpl