Fix inconsistency in email NameID format.

Merged into 1.10-branch from r3208.

git-svn-id: https://simplesamlphp.googlecode.com/svn/branches/simplesamlphp-1.10@3210 44740490-163a-0410-bde0-09ae8108e29a
docs: Fix documentation for NameIDFormat in SAML 2.0 SP remote reference.

Merged into 1.10-branch from r3209.

git-svn-id: https://simplesamlphp.googlecode.com/svn/branches/simplesamlphp-1.10@3211 44740490-163a-0410-bde0-09ae8108e29a
consent: Fix accented character in includeValues documentation.

Thanks to Matthew Slowe for providing this patch!

Merged into 1.10-branch from r3214.

git-svn-id: https://simplesamlphp.googlecode.com/svn/branches/simplesamlphp-1.10@3215 44740490-163a-0410-bde0-09ae8108e29a
Merge branch 'simplesamlphp-1.10' into ldapmultimap-master
sqlite: fix storage to use sqlite3
statistics: add avg and max
statistics: add merge handling of avg and max
statistics: check file and dir properly
statistics: enabled
libs: add forcehttps and forceport parameters to config