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

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

author	Quentin Smith <quentin@mit.edu>
	Sun, 25 Jan 2015 03:49:03 +0000 (22:49 -0500)
committer	Quentin Smith <quentin@mit.edu>
	Sun, 25 Jan 2015 03:49:03 +0000 (22:49 -0500)
commit	1dde8961f4f93f4210f5e55c5e378198473053be
tree	addcc8dd257350a275cbf01095b8fd8a1c363928	tree \| snapshot
parent	aea9a6892f40347098d91e4afdb7c1911e59387c	commit \| diff
parent	8c35714a37095c720308478660001a5fd9db5bfc	commit \| diff

Merge branch 'master' into sipb

Conflicts:
po/Makefile
templates/page.tmpl

wiki compiler