]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'fae59b07b02dbcaba892e96ff86f3f800e6ef54a' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:58:10 +0000 (00:58 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:58:10 +0000 (00:58 -0500)
commit0a046b842b997203c3b8ff646610ec181bc96e34
treec37ecad9d3d962743f854b8bf0af1b160138fe4f
parent20e37d93139e2d536b39e29c545d8ad3f52ffd63
parentfae59b07b02dbcaba892e96ff86f3f800e6ef54a
Merge commit 'fae59b07b02dbcaba892e96ff86f3f800e6ef54a' into sipb

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