Merge branch 'MDL-45759-master-2' of git://github.com/andrewnicols/moodle
commitfa386d61728f87655e05cad8ffe6ba60e286f8e2
authorMarina Glancy <marina@moodle.com>
Wed, 13 Aug 2014 08:23:12 +0000 (13 16:23 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 13 Aug 2014 08:23:12 +0000 (13 16:23 +0800)
tree0d90910c28af4a67437efd97900a64bd2aa1c96c
parent60127c84b58eccbdaef17ca4db71812c52791839
parent5afbca2485458d91728038e3eb740b39aecfca9a
Merge branch 'MDL-45759-master-2' of git://github.com/andrewnicols/moodle