Merge branch 'v0.98-series' of ssh://pcudssw1515.cern.ch/afs/cern.ch/project/indico...
commit83c12ae415a3f7364c7c190e94fee543dea8701b
authorPedro Ferreira <jose.pedro.ferreira@cern.ch>
Thu, 25 Aug 2011 16:11:00 +0000 (25 18:11 +0200)
committerPedro Ferreira <jose.pedro.ferreira@cern.ch>
Thu, 25 Aug 2011 16:11:00 +0000 (25 18:11 +0200)
treea637901ff41c8840aefb64543633814345d37828
parentcc5d1b7494fe3db6783d023113d5e85347e9303b
parentdc366df586eee01544c44e0c1afa42f7823e026d
Merge branch 'v0.98-series' of ssh://pcudssw1515.cern.ch/afs/cern.ch/project/indico/repo/cds-indico into v0.98-series
indico/MaKaC/common/Configuration.py
indico/MaKaC/webinterface/pages/conferences.py