Add scc travis-merge to the Travis before_install step
Adding git user config for travis
Replacing number-dash with double dash
Add information about web proxy.
Add web proxy configuration.
Fix typo and whitespace.
merge dev_4_4 -D org -I include -E exclude: PR 982 (Add support for Ice 3.5)
merge dev_4_4 -D org -I include -E exclude: PR 988 (webgallery prototype from github/will-moore/webgallery)
merge dev_4_4 -D org -I include -E exclude: PR 1126 (Fix long-missing DELETE EventLogs)
merge dev_4_4 -D org -I include -E exclude: PR 1176 (Import status tb dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1233 (OMERO.matlab: add object creation functions (see #10637))
merge dev_4_4 -D org -I include -E exclude: PR 1234 (Web image object id extension 11022)
merge dev_4_4 -D org -I include -E exclude: PR 1249 (Dataset creation 11048)
merge dev_4_4 -D org -I include -E exclude: PR 1261 (11074 export close (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1279 (Orphan folder dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1281 (Viewer issue dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1282 (Refresh browser dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1283 (Thumbnailbean dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1284 (DB 4.1-4.4 upgrade script fix from Bernhard Hollaender (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1285 (Provide SYSTEM priority thread executor for reload (See #11033) (rebased onto dev_4_4))