Merge remote-tracking branch 'origin/master' into authpluginconfig
commit27ffb3e11e089645f9e374808063313ed7a08722
authorKlap-in <klapinklapin@gmail.com>
Sat, 16 Feb 2013 22:38:41 +0000 (16 23:38 +0100)
committerKlap-in <klapinklapin@gmail.com>
Sat, 16 Feb 2013 22:38:41 +0000 (16 23:38 +0100)
tree5be9c41488615bd5ab9a857ed258253ea283f501
parente57cf65d092c1a6458c3a468b017018905018eeb
parent4005b0809260fbd36cb8652c7d726a5ee417c6f6
Merge remote-tracking branch 'origin/master' into authpluginconfig
lib/plugins/authldap/lang/en/settings.php