Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 24 Apr 2015 02:25:29 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:20 +0000 (10:19 +0100)
commit0264bb1ecbc9e88995ad536000ed3a68efbabf9a
treece02830345a4f8632e2413e984c67d2640cd3545
parent5975d9521a15eae9ba68d1474e191db1c101b2ee
parent32498c28ea4f02deb0e9480b441f804b42c580ea
Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle