Merge branch 'MDL-47509' of https://github.com/stronk7/moodle
commit0993f24df021710271400ff918a402804199a717
authorDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 06:13:18 +0000 (9 07:13 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 06:13:18 +0000 (9 07:13 +0100)
treeba92b2b91e6a8cbe2b48d2a3982d1e964a944f9f
parent0835816f9e8c95aded36100d6d2add6cdf280afb
parent278432258f04281497bb41f6cfc390e7f3cca050
Merge branch 'MDL-47509' of https://github.com/stronk7/moodle
availability/condition/profile/classes/condition.php