Merge branch 'MDL-40255_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:26:49 +0000 (19:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:26:49 +0000 (19:26 +0200)
commitc55a7ac5b058ee6655d99a2207ac707a45b4ab58
treee7b64d4d8eab4d494a5aa5d78261189c3c63e164
parentd158acc4ff84a800662df13d320b80e214c759ca
parentd80a7da7c1566f40a50411b826cc7db4e547ee48
Merge branch 'MDL-40255_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE