Merge branch 'MDL-47810_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 15:03:51 +0000 (15:03 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 15:03:51 +0000 (15:03 +0000)
commit971163afaa5581eb4c896adb2b1e76c4fecd9bf1
treee62652cd3890b6e6889fc7639d5d6973d66c59dc
parenta46b0575726221038289b4eba618300f2bf34e3a
parent88f64b5111d181d7cf8019d476a28c3757218565
Merge branch 'MDL-47810_master' of git://github.com/dmonllao/moodle