Merge branch 'wip-MDL-26155-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2012 16:26:31 +0000 (17:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2012 16:26:31 +0000 (17:26 +0100)
commitbb2308a33a42417377b1a5e9337c73b88c1faceb
tree7e466906c44cd8bbd46fc71094f7e0ffc7c19e85
parent2482570b9f4f7e847cf86c11d2968d72272dad69
parent2ad2ad0915c890548b3339107af8b51581cf5af3
Merge branch 'wip-MDL-26155-m23' of git://github.com/samhemelryk/moodle

Conflicts:
admin/settings/security.php
admin/settings/security.php
lib/moodlelib.php