]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '5971a731e98b9b6543d78572c181ffc1bb7e1dd1' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:36:12 +0000 (00:36 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:36:12 +0000 (00:36 -0500)
commit05e2a673a893b06de4ea0abc6b18f532367b1560
tree52919b2a108a244395c2c6b5eb09fad2da3ea55b
parentef6f07cc0656b3deb64ba06a338cf1a508909a4f
parent5971a731e98b9b6543d78572c181ffc1bb7e1dd1
Merge commit '5971a731e98b9b6543d78572c181ffc1bb7e1dd1' into sipb

Conflicts:
templates/page.tmpl