Merge branch 'wip-MDL-41102-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commit3b7aef2de9bded6a2e95f25bee82cfe60ed7984a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:20:57 +0000 (2 02:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:20:57 +0000 (2 02:20 +0200)
treefacf85091b1f5146141e72929ab35166d526a964
parent6aefe4ec3c26cf68b6e49827abd22ba5962ffa88
parentd096d4e43c907fdcdead049fcd4826f33e8fac2a
Merge branch 'wip-MDL-41102-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE