Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 13:46:30 +0000 (14:46 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 13:46:30 +0000 (14:46 +0100)
commitcd2cfb578334e578fcef5d9fad2a07e7b6df9792
treea7336186c8eb689f22492145c1bb373716f84d3d
parent9f67037a5fe19cce5bb3b919f7bac0bab783e793
parenta96ca7006482a0d0950a138783eebd3497a094e9
Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle