Merge branch 'MDL-51016-m' of git://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 06:21:00 +0000 (14:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 06:21:00 +0000 (14:21 +0800)
commit6df0e788499ebefcfc724c5e52dac932dc5e2f4f
treee819d7a51b2807753ae15c0f077a7595a1a89b14
parent78af7dae54d0b92ef265fdb72532b49c144445d3
parent80dfcf49f58ad22e6ab51b6078df4a6e92c32ae3
Merge branch 'MDL-51016-m' of git://github.com/micaherne/moodle