]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '827e092b58771e5c5efdbc1cf04a62a1d039a015' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:46:45 +0000 (00:46 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:46:45 +0000 (00:46 -0500)
commit7a3d81619c3fb50b7b77932df91edc239d3ee09c
tree3b908d380506498ae48c6b8181ea810386d66c0d
parentddfb35bc625a38e1e6a1b068013cfc0c2f6d122d
parent827e092b58771e5c5efdbc1cf04a62a1d039a015
Merge commit '827e092b58771e5c5efdbc1cf04a62a1d039a015' into sipb

Conflicts:
templates/page.tmpl