Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 03:26:06 +0000 (15:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 03:26:06 +0000 (15:26 +1200)
commitb32e1778bb8063c573b8b54e56ebaba8f76bd466
tree2c6027bc501c9268b47cd0459fac088f71cb63f1
parentbe91dff8bb91e8762a6d954f37f62537f38ad843
parentdaad1b4b972935d41d7c30b66b380a1718fe992d
Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle