Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 08:31:17 +0000 (16:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 08:31:17 +0000 (16:31 +0800)
commit4daa024fd419e78fea87cb702ea308d0b27622eb
treec454be704383a90c29a1edfaa364910bd7ba05ae
parentb1a6c9dc5253d1666659c86260747b965bf9998b
parentbe99db5b963fa898e556c71bdd6cb8255c57ecda
Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle