Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 6 Nov 2014 07:14:05 +0000 (15:14 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 6 Nov 2014 07:14:05 +0000 (15:14 +0800)
commitf2db391f590717ae0fe46825062a8db1e83021d8
treecdbee12823481ff8e3d641199e7fb9e5e044a721
parent527464a618a71337f4764a903f7ebb283eeb2696
parentdd01789b4f06c0f2aca6bcb59d1819bee3426e13
Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle