Merge branch 'MDL-49034_master' of git://github.com/mattporritt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Feb 2015 01:36:22 +0000 (09:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Feb 2015 01:36:22 +0000 (09:36 +0800)
commit157643cacdeaed6af6090f647f311da4dcd88515
tree4347bcbd6bd24f62a4986ba4b4bd349e0d3e8fbf
parentb9e059dcf397a2c74832aaefadbe99874e9a7fdf
parent7e36bb719723f0df96472c46787719e184760470
Merge branch 'MDL-49034_master' of git://github.com/mattporritt/moodle