Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle
commitec2ee188fcdf1d88aaf7e186c2a0899058bb1638
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:48:21 +0000 (23 01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:48:21 +0000 (23 01:48 +0200)
treee5ebecd98d724195f45518ce7c61c3eba5198c4b
parent4922a1d46a3c1ba18b19bc00dd195d178b666a48
parent535364c8f5a32e125449e9713fd5c031294a4325
Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle