Merge branch 'MDL-49923-master-fix1' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 10:06:26 +0000 (18:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 10:06:26 +0000 (18:06 +0800)
commitd670f31fc7c3be70a3a9eb5537635e0d30601735
tree6c7adf901cdc10ecc720008554946aa07f3641df
parent35ea78d2ba26497dfb4598082ed78dcf27da44c1
parentdd636abf38ef995761bffa2d78c2c2a62610b89e
Merge branch 'MDL-49923-master-fix1' of git://github.com/damyon/moodle