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

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

sipb-www / ikiwiki.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cac6df3 4da6e94)

author	Quentin Smith <quentin@mit.edu>
	Sat, 13 Mar 2010 22:53:12 +0000 (17:53 -0500)
committer	Quentin Smith <quentin@mit.edu>
	Sat, 13 Mar 2010 22:53:12 +0000 (17:53 -0500)
commit	ce7966a82cf8d0043a771a1a5b26e3a953e909b2
tree	a3d70dcf25a74388c5e0b62cd946bb8eb647858f	tree \| snapshot
parent	cac6df3fe65992a567c44aa365f5446c20ba94ea	commit \| diff
parent	4da6e94305c2c7f4adab057b362d9e58a7494439	commit \| diff

Merge branch 'master' into sipb

Conflicts:
po/bg.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gu.po
po/ikiwiki.pot
po/pl.po
po/sv.po
po/vi.po
templates/misc.tmpl
templates/page.tmpl

IkiWiki/CGI.pm	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/git.pm	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/httpauth.pm	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/mdwn.pm	diff1 \|	diff2 \|	blob \| history
IkiWiki/Plugin/parentlinks.pm	diff1 \|	diff2 \|	blob \| history
IkiWiki/Wrapper.pm	diff1 \|	diff2 \|	blob \| history

wiki compiler