Merge branch 'wip-MDL-52081-master' of git://github.com/marinaglancy/moodle
commitea2707f9dc3be772907c8d83becb886dbda4b15e
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:15:10 +0000 (10 17:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:15:10 +0000 (10 17:15 +0800)
tree3215546b7373c39aca167560369c35f32f6ef955
parenta4fb9924353a4d34cb46cf96e7ccccd8d009ab55
parent32fada5cb2f25f3e234c485d706468a69277171d
Merge branch 'wip-MDL-52081-master' of git://github.com/marinaglancy/moodle