Merge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 00:33:49 +0000 (01:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 00:33:49 +0000 (01:33 +0100)
commitc7dcaf132484a8a4f949bb77044e156ecc242d6b
tree53fe60d3e7a5b1a446268a2c492f7719f1300f4a
parent358f8debded597f039905fb9ae81ec575ce46a60
parentf88bd546eb2fac4408caf4e63c4409999d03cb6e
Merge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE