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:54:44 +0000 (00:54 -0500)
committer	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)
commit	9a295bec5f361bed184c035651d6168286238b98
tree	dddb6a37784f6d9faaec26ee69e4d25a7888afc4	tree \| snapshot
parent	862230968fc61678f512f10639c3b8348d82e019	commit \| diff
parent	156f70912213b6520e9056050a8827de66e80176	commit \| diff

Merge commit '156f70912213b6520e9056050a8827de66e80176' into sipb

Conflicts:
templates/page.tmpl

wiki compiler