Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 30 Apr 2015 06:53:52 +0000 (14:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 30 Apr 2015 06:53:52 +0000 (14:53 +0800)
commitd56732092802bf01b5c5636979c83fb06a77e541
tree89a050c4d1266d6d4383f09109556a8b1f24ef4f
parent388b0beec19dab3105e515b8204c7199d2289f44
parent5c3b5143dc3d2cd2f22d8d6abecd5fb3b9eab020
Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle