Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 06:57:43 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 06:57:43 +0000 (14:57 +0800)
commit86575fa70955811b455437a8422c36afc6d9e47d
treee7f5c80f012feae2e613d9b5231bc793c430e9c4
parent033b07895c3559a05ad359486f29cb80d77bc7d6
parent5e9fd83df8f2c175681fa5a81d36df5ee313cb1e
Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle
lib/conditionlib.php