Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:42:58 +0000 (08:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:42:58 +0000 (08:42 +0800)
commit7960ad0571662f8964137744cfe09e9d2290c787
tree33b02d4ae1bfd791b40fac121f7d468f760bab85
parente787e681fc0369094ab0c310fe8ec3874aaa1726
parent48a9ef9e962088863a8b4bef03223b358943016d
Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle