Merge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 03:13:25 +0000 (11:13 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:50:01 +0000 (18:50 +0100)
commit935b954b5bb29d12f055fbc24ee3a9954d2dac0c
tree8c934b0c2c0a90afeb6175805783daf197f341f1
parentb4153ff09db1ac73c8f966b5362a06c57df98563
parentf3f920d24f6139c6752a3567b91b28bd537a702d
Merge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle