Merge branch 'MDL-49169_master' of git://github.com/grabs/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:01:00 +0000 (14:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:01:00 +0000 (14:01 +0800)
commit0e9a99f449c3ff228cddabac54970313b8f3d910
treee46456baa6a668112f91903bc320f69d1fd85d25
parenta50840db340557140e06cc52af3bf121d81584e8
parent3d944c8b209feba7b7bd232aa41f0b169e769243
Merge branch 'MDL-49169_master' of git://github.com/grabs/moodle