Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle
commit4b7af5040d99b63b5d73f3ffb1851e813dbabe60
authorMarina Glancy <marina@moodle.com>
Thu, 22 May 2014 04:59:56 +0000 (22 12:59 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 22 May 2014 04:59:56 +0000 (22 12:59 +0800)
treee872fae9477bc0e3ae2e599f0f8853155d188eb8
parentae14a501148739c1c1e17a21cd645d27851dcf3d
parent2c549f7802dda10a5d6028ae798c77eea6a5802b
Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle