Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)
commit4cbf997db052a134d715d888ac22548ad2ebff46
treec93d9a76cf1648171668e041e18fd19955ea0f5e
parent406712e9895f703da106ef90b4608ad39abcae95
parentfc05c1b8e53db921aaf330caca1dee76f0b8d0e6
Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle