Merge branch 'wip-MDL-29303-master2' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 02:01:58 +0000 (10:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 02:01:58 +0000 (10:01 +0800)
commit981649256a2f4411c9331c3a48d32e61edbe3263
treeba67a28c731b66eb7aed1ed8f6bc84fe70bb9e0e
parent497cd6d48b76ab6539f42b4ac3da0b20bf58d09b
parent2aad1094b1d057cb30ca734aed53dcb44a317e5c
Merge branch 'wip-MDL-29303-master2' of https://github.com/marinaglancy/moodle