Merge branch 'QA_3_4'
commit29e658a1f796fe7a843faaa49e0c4942fd4ed2fc
authorMarc Delisle <marc@infomarc.info>
Mon, 21 Nov 2011 17:42:07 +0000 (21 12:42 -0500)
committerMarc Delisle <marc@infomarc.info>
Mon, 21 Nov 2011 17:42:07 +0000 (21 12:42 -0500)
tree6cca40b1f274c9a0b29eef017a2a6bc41ce47cd3
parenta26e706378806eb428bf32038b590612784141e6
parente2b6af5a99b9a053609ff76724fdc4a6a48dd14e
Merge branch 'QA_3_4'
ChangeLog
libraries/auth/cookie.auth.lib.php
libraries/auth/http.auth.lib.php