Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:05:26 +0000 (10:05 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:05:26 +0000 (10:05 +0800)
commitb8d2340bb743811e1b55dc14cbad2ab78a8771a2
treeb02737704bc9ea4515a601a5f8bcd07767f542e3
parentb67362cf98e5f2d4cd0635397a275c532b400a89
parent935448edb16e4bb11a010f11dec9f62f1d6cd800
Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle