Merge branch 'MDL-48685-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE
commit7e67e4d6199847dec5f9e63526c23a81120f2c50
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 23:46:29 +0000 (28 00:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 23:46:29 +0000 (28 00:46 +0100)
treeb36e3a047f27f7e06095edf6e5047339934fb6b5
parent510ffce704940c09c793dc2c22d15de8b82557ba
parenteeaf95494f5fe73116345deaa4e743d46c2c14f2
Merge branch 'MDL-48685-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE