]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '0c320f45e84e454aceaf150d51e84b639444e8d5' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:58:52 +0000 (00:58 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:58:52 +0000 (00:58 -0500)
commit363e6ad73e1da7d5e479653d5a6d81445083bdea
tree201ce3d9eda22a999c3b8a6617a0667d15304503
parent0a046b842b997203c3b8ff646610ec181bc96e34
parent0c320f45e84e454aceaf150d51e84b639444e8d5
Merge commit '0c320f45e84e454aceaf150d51e84b639444e8d5' into sipb

Conflicts:
templates/page.tmpl