Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:26:44 +0000 (09:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:26:44 +0000 (09:26 +1200)
commitba5d7f8b1cb522fdec316397204b346295fc86fd
treea2a458665556175d274212147e2a796b1859d350
parentf773cb2e9424bb5366e139e1404c8db99c8de62f
parentee2d1451a60b9ad211a39f4841d4e5fe5174ae39
Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle