Public Git Hosting - cds-indico.git/commit

commit	d311be9df5ca117864406ee866b55ff4a84e1944
author	Pedro Ferreira <jose.pedro.ferreira@cern.ch>
	Fri, 28 Oct 2011 11:23:53 +0000 (28 13:23 +0200)
committer	Pedro Ferreira <jose.pedro.ferreira@cern.ch>
	Fri, 28 Oct 2011 11:23:53 +0000 (28 13:23 +0200)
tree	d6ac50de6c8228bf105f2f01c1765e60eacd7c29	tree \| snapshot (tar.gz zip)
parent	ae75468aa749a9becff144b88235fc7891da8dc4	commit \| diff
parent	59779cc191e3450e62da78005f4941be938ac841	commit \| diff

Merge branch 'v0.98b2' into v0.98-series

CDS Indico - Event management

indico/MaKaC/common/TemplateExec.py	diff1 \|	diff2 \|	blob \| history
indico/MaKaC/webinterface/wcomponents.py	diff1 \|	diff2 \|	blob \| history
indico/web/http_api/api.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history