Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle
commitfb00b083cebe218d24b6c6cde018b41670fe070f
authorDavid Monllao <davidm@moodle.com>
Tue, 26 May 2015 04:28:59 +0000 (26 12:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 May 2015 04:28:59 +0000 (26 12:28 +0800)
tree9a724f667a835367112f3a9f5cbd743c8505c9ed
parentc8f92d487a8eec927534f515f6585aface1edd06
parentfa31be3b7f9157ad36c17a800de709a1afecf537
Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle