Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 06:07:21 +0000 (14:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 06:07:21 +0000 (14:07 +0800)
commit5269e6002d09fb65ce55c7c2ee735a9bd10b784d
tree2b7c30ed35efdebc5fa9ba0079f97298fd81826f
parent6f77b910eec6e49783099dcb12be40059612d4ea
parent333dcd863f23433d0566cf8785f9609733b0ca71
Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle