Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)
commitb6c34ef9f5830071ce4d1b1adbc2c0c5405398e9
treeb2d5ad000a109d660a11d1f39f99792ec45bcae5
parent78db0d13de6fdc58b6b15de9b6a2b2c5124e1790
parentb81da1f27c9aaaeb7e9d988cf6db18839b9f7a8e
Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle