Merge branch 'MDL-6102-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 21:02:10 +0000 (22:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 21:02:10 +0000 (22:02 +0100)
commit528dbf2f7d65ca1dd7c9d9cfbd389b5e9afad9bf
treed6dc538549ccab1946d809577e4b14a27a59e42e
parentfb051bf072c333ba3cc1d601715b1b8b790ef18b
parent487de67c480337c76737105b59114b0468c6766e
Merge branch 'MDL-6102-master' of git://github.com/sammarshallou/moodle
lib/moodlelib.php