Merge branch 'm27_MDL-31366' of git://github.com/danmarsden/moodle into MOODLE_27_STABLE
commit67711964d1b96107e54c9131ffd8c88000e45525
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:17:44 +0000 (14 18:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:17:44 +0000 (14 18:17 +0200)
treeae89cbb9d828a044a7783ac35d9fb4b117b39871
parentbf394372d8dfa78f374a69733ea07aabd9b463c0
parentca602b6bebc78893ce7ba1f551650c5790dcb272
Merge branch 'm27_MDL-31366' of git://github.com/danmarsden/moodle into MOODLE_27_STABLE