release id d54266affa
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/githead
Add simple login link to user_login-out plugin

Only issue is new option - password form is not redirecting properly.
Merge pull request #856 from gjr-osweb/master

Add simple login link to user_login-out plugin
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zp-extensions/user_login-out.php

	modified:   zp-core/zp-extensions/user_login-out.php
Sub-rights issues when not logged in
Merge pull request #113 from sbillard/master

cumulative changes