Merged r1084, r1085, r1090, 1092 and r1093 to 1.11 branch
Merged r1142 to 1.11 branch
Merged r1144 (updated CHANGES) to 1.11 branch
patched r1147, r1148, r1149, r1150 to branch v.1.11
Fixed 7 cases of missing double quotes - from trunk r1154
updated CHANGES
From r1160: Security: Do not show all registered userids when adding a user to an entity. The userid must now be entered manually.
Updated CHANGES
from trunk r1165. Removed refURL and added $_GET as parameters before redirecting to janus/index.php in dashboard.php and editentity.php. Solves the problem that mailtokens issued to pages other than index.php did not get passed to index.php where they are actually checked.
Updated CHANGES
merged r 1170 to branches/v.1.11
merged the rest of r1170
merged r1175 and r1176 to branches/v.1.11
update CHANGES for release 1.11.7
Merge branch 'master' into v.1.12-merge
Corrected repo urls from google code to github
Added issues for 1.12.0
Converted url's from google code to github
Merge branch 'v.1.12-merge'
Merge remote-tracking branch 'origin/master' into develop