sipb.mit.edu Git - ikiwiki.git/commit

author	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:47:26 +0000 (00:47 -0500)
committer	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:47:26 +0000 (00:47 -0500)
commit	c0c0068a0308884dc41921157d672c62eef9e83d
tree	fa74bebfc7287ddb219f33e71ea18efef083725a	tree \| snapshot
parent	7a3d81619c3fb50b7b77932df91edc239d3ee09c	commit \| diff
parent	ffcd2da8274b44663207bb866007ee3bc8d8a15f	commit \| diff

Merge commit 'ffcd2da8274b44663207bb866007ee3bc8d8a15f' into sipb

Conflicts:
templates/page.tmpl