Merge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:51:32 +0000 (11:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:51:32 +0000 (11:51 +1300)
commit28fffe1f9bd7ccb8dba5823d57849450ac8fb7e9
treec621e16166988291a72b5cc7e3a36dde0bbb647e
parent15a41395063319c5b8729d59a671472b395bdad0
parent80ee9add2dec44ee501c9fc02b66066cc701b75a
Merge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle
availability/condition/profile/classes/condition.php