Merge branch 'MDL-44492_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit648bf857d3c4185438de57154a38c9478e33539e
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 13:17:58 +0000 (8 14:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 13:17:58 +0000 (8 14:17 +0100)
treec5f622790ada6ea98617c82155c47fb7fc8856c6
parent166e18d7cbb36d58d08a2783edd98284d5a3b98a
parent2c78623121650c7ee0fa08e3d8e6cbc2f75bfa24
Merge branch 'MDL-44492_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE