Merge branch 'wip_mdl-31540-master' of https://github.com/iarenaza/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Apr 2012 05:55:00 +0000 (13:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Apr 2012 05:55:00 +0000 (13:55 +0800)
commit4e25e4696be1269a0f583251d287ba65f96d3eb2
tree42339089c7708207f47c1f1435b6cc5ba9cdacdc
parentb68eef5e0ba728021c06894f5624ced23b7cb31c
parentca769fa7f8e2d00fa5283e6a802b6d14eb47bc45
Merge branch 'wip_mdl-31540-master' of https://github.com/iarenaza/moodle

Conflicts:
auth/ldap/auth.php
auth/ldap/auth.php