Merge branch 'MDL-49536-28' of git://github.com/ryanwyllie/moodle into MOODLE_28_STABLE
commitab5884d16d3130cdc1b7496d10f717624f98e18f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:48:36 +0000 (31 20:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:48:36 +0000 (31 20:48 +0200)
treea90958f055b7b69f91e77d7a41bf852aeb4c48e4
parent0448dbe7c1b93f31d8f353c7b39305a47689151a
parentd74ec947220a5647213b3200aeba0135188329c6
Merge branch 'MDL-49536-28' of git://github.com/ryanwyllie/moodle into MOODLE_28_STABLE