Merge branch 'MDL-46681_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commitea2833bc35900080dca5c76be5122841b2caca82
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Aug 2014 23:44:23 +0000 (12 01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Aug 2014 23:44:23 +0000 (12 01:44 +0200)
tree36f006ad573c5f62b2aa57df49b62b224ee5d661
parentb4875aa3485cb467950292d042675fc1bf792ce3
parent5049dfcecaa17d38d8265b84e58c97f0f0cbb257
Merge branch 'MDL-46681_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE