Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)
commit72dd7162e1ef6b37bd7b239c71faaf004459c5e4
treea427d4227dba82c2cd29c81ad035d8e8c5b0c0c0
parent5269e6002d09fb65ce55c7c2ee735a9bd10b784d
parent626ff7c8b89e64583939bd1f333aad8a9b5f234d
Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle