Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 12 Dec 2013 05:49:56 +0000 (16:49 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 12 Dec 2013 05:49:56 +0000 (16:49 +1100)
commitbdd5a6c5c21a79b3aed3120810875dd9542a409d
tree5b96a8584ed49ef02a588e58731bca6b729ebae5
parent10484ad5e452de946005869aa192c149fd308404
parentfb99ef1ded70a7ae7d4f093044b891f07ce73c8d
Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle