Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 20 May 2014 01:52:25 +0000 (09:52 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 20 May 2014 01:52:25 +0000 (09:52 +0800)
commitf0085cd6ab18797c2cb5a7422f8509c986596e10
tree1c706a1d986425fc7a0df3f480adccc37a21ff28
parent0c722830d9a4c38bf6db600967b4b9f717e7fc00
parentabdbfc76fcfddbb420e5f314b58c3392bfd8ac61
Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle
availability/condition/profile/classes/condition.php