Merge branch 'v0.98b2' into v0.98-series
commitef1a5840400eaf6f8d29f27d06ff7dae758b644e
authorPedro Ferreira <jose.pedro.ferreira@cern.ch>
Tue, 8 Nov 2011 09:18:32 +0000 (8 10:18 +0100)
committerPedro Ferreira <jose.pedro.ferreira@cern.ch>
Tue, 8 Nov 2011 09:18:32 +0000 (8 10:18 +0100)
tree22e75408d1232a690dbb41c96f54f1c5fa140b8e
parentd311be9df5ca117864406ee866b55ff4a84e1944
parent5275c12ad45d755c0730634d6dd1b145ade0e50c
Merge branch 'v0.98b2' into v0.98-series
indico/MaKaC/common/TemplateExec.py
indico/MaKaC/webinterface/wcomponents.py