Merge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 01:54:52 +0000 (09:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 01:54:52 +0000 (09:54 +0800)
commita43c1ca7d4f3b318450e8d484c7d12c965ec12fc
tree0fdb7cb62bb8a5e43265d88be72b1d9025021fe9
parentb22692d7407c8b4eec67f7604cf488c75571603c
parentd238016e0d56b36ae4c9b3fed7edace503cdbcd1
Merge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle