Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:06:10 +0000 (13:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:06:10 +0000 (13:06 +0800)
commit27885779bcfaa01d6c24f18dcf9bacc92a71cc3e
treefb2e1a3ee62c600fac1cd5cc8412736424381525
parent76a32e1a6fc087f317c2074e6e09ee5c319c993c
parent9a8caba23896fecce12cfc4e523e39a05e4a0d3b
Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle
lib/conditionlib.php