merged https://svn.plone.org/svn/collective/PASPlugins/Products.LoginLockout/branches/ajung-login-logging
updated
Merge branch 'master' into ajung-login-logging

Conflicts:
	Products/LoginLockout/CHANGES.txt