Merge branch 'MDL-48255-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE
commit2d16c385d7178d6c9655840c29d0aceccd25c84e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 18:15:12 +0000 (8 19:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 18:15:12 +0000 (8 19:15 +0100)
treed54a3d24f3f39a628f1402f5e305341248b260e0
parentb2959dbe9b996eec00d79e89169b703fe56d7a67
parent53e96ae4e1510c13dd14612f028f91ef3e2b1eca
Merge branch 'MDL-48255-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE