Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 03:43:12 +0000 (15:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 03:43:12 +0000 (15:43 +1200)
commit54c4398a6d880dd99fb079acc9b2880eefe4c37f
tree129ac5192d7bf0825044c4d0fc8567b757c9ad60
parentb017ff6da66d165bfee9751be88cf1b0d5c982b0
parent1a361486a9a8ea88c2f3cfeb9acd8a2b7d21b9fc
Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle