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

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

author	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:55:36 +0000 (00:55 -0500)
committer	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:55:36 +0000 (00:55 -0500)
commit	edee0db894c7e99911d9ac1b7d9453e477fe0cd6
tree	7c0124db338830c9e49a796f4774963a050140c0	tree \| snapshot
parent	9a295bec5f361bed184c035651d6168286238b98	commit \| diff
parent	1a8cbf526cdc7e77bfa084e266b8633858b68a09	commit \| diff

Merge commit '1a8cbf526cdc7e77bfa084e266b8633858b68a09' into sipb

Conflicts:
templates/page.tmpl

wiki compiler