Merge branch 'MDL-40228-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commitf50f41c5072cc0b35a528d8696e29b6873e223a5
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 07:56:47 +0000 (30 08:56 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 07:56:47 +0000 (30 08:56 +0100)
treea460ad077f7e187835fbfef9698f3fa8325a0a83
parent5c1049f72bfc192420281551af7356cb5ec18ea3
parent8fc9105a7a3c10853821d6f2ac57c726077ed4a5
Merge branch 'MDL-40228-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE