Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 03:15:21 +0000 (11:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 03:15:21 +0000 (11:15 +0800)
commitf381eede5157da1b7f6c72bb6e642557890f729a
tree6cf536898279091b4edfb227eaf16b5bf4cb47c4
parentfb032ccb3f4652dc87a7c33fe66a556f31660d83
parenta0e89a8fe34be6e60859679b11f1fee9ccc9b22f
Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle