| commit | 11d8b51864e45ae774549486835f1bca9adc6eaf | |
| author | Pedro Ferreira <jose.pedro.ferreira@cern.ch> | |
| Thu, 25 Aug 2011 13:10:55 +0000 (25 15:10 +0200) | ||
| committer | Pedro Ferreira <jose.pedro.ferreira@cern.ch> | |
| Thu, 25 Aug 2011 13:10:55 +0000 (25 15:10 +0200) | ||
| tree | 15752c87fbbde125e92df175132d9d91bbfcb7bf | treesnapshot (tar.gz zip) |
| parent | 9cd65904d040dd1e29bc315be543bd2d96fb37e3 | commitdiff |
| parent | ead92285b5ecb59e51fdea7c7ce39f786e4d8916 | commitdiff |
Merge branch 'v0.98b1' into v0.98-series
Conflicts:
indico/MaKaC/webinterface/rh/base.py
indico/MaKaC/webinterface/tpls/RoomBookingSearch4Rooms.tpl
indico/core/index/catalog.py
Conflicts:
indico/MaKaC/webinterface/rh/base.py
indico/MaKaC/webinterface/tpls/RoomBookingSearch4Rooms.tpl
indico/core/index/catalog.py