Merge branch 'MDL-40119-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commitccd01c08f4501b372b90f0cb2defe22c7a454d60
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:18:21 +0000 (8 02:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:18:21 +0000 (8 02:18 +0100)
tree12fa50694f8183365864fbc1a253b03147acbd90
parent51add5708c119a9511d3cc227167f598af15a054
parentcaccbdda8d9a34eb43592dcb1d813e1ba75f1b2f
Merge branch 'MDL-40119-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE