Merge branch 'MDL-38286-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:31:43 +0000 (09:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:31:43 +0000 (09:31 +1200)
commit1f6181e5aa656223d9aee94594cfc9db32389a23
tree2ab236342d5b7ea6d567e42032054665ef0d2c5e
parenta78e39e3d31b7acd9b54cb4bd39d6bd356424320
parent97f4bad867c97e379e97eda8534baf5c87d274e3
Merge branch 'MDL-38286-m' of git://github.com/andrewnicols/moodle