Merge branch 'wip-MDL-41921-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commit46b23b69faba9e6668f3340dca619951715682df
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:56:27 +0000 (1 19:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:56:27 +0000 (1 19:56 +0200)
tree2ce8d67553c1c11b37318e297bced6341e6b6a67
parenta348f55e3fc9ec429e30c06329a4c63958dae79a
parentb0aea95a96dd29dc892074d7fef0578dff9c8085
Merge branch 'wip-MDL-41921-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE