(2/3) MultipleRepositorySupport branch synced with trunk [7684:7811/trunk/trac/web/chrome.py] - there was an actual conflict resolution there (authorinfo vs. show_ip_addresses, taken both)
Authored by: cboos 2009-02-02
Parent: [r7813]
Child: [r7815]
