Merge branch 'MDL-49748-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:17:26 +0000 (15:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:17:26 +0000 (15:17 +0800)
commit9aabc32294269dda611c461cf99795710594e82f
tree5095154acaa80166f608ce9d2abe8b269dd19666
parent4969c8ba63254f78c7628d08648e5beb4fdcbc1e
parent9b5e702a1152894c434a60c9e2853485e6ec199c
Merge branch 'MDL-49748-master' of git://github.com/xow/moodle