Merge branch 'MDL-49094-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Mar 2015 11:36:34 +0000 (12:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Mar 2015 11:36:34 +0000 (12:36 +0100)
commitaa38c5e98d81295d3b56a1caef51c1d2bc1f7678
treec288352bd8fd37bd4736c9e61752b10e23402fa7
parent3fb98d64e2dcce4bbdc9d4bddbbffb76ed59a8a7
parenteb67d5a690e49ad82bf1d72fd76b7e060cc225b8
Merge branch 'MDL-49094-master' of git://github.com/andrewnicols/moodle