Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 22:51:57 +0000 (06:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 22:51:57 +0000 (06:51 +0800)
commitf811003aaeb9ff9bb76ee047d609616a5d6bd077
tree4683fdae22c8993bcee366f18b70f71a12ea9cdd
parent197f99a80863182cfac2bfab7e109774af23b1d5
parentdfc7c0a9dfae30177b5e8e85fdffad6d276003f6
Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle