Merge branch 'w14_MDL-38753_m24_ocicount' of git://github.com/skodak/moodle into...
commit989a8abc442e8e9e55e896ac2225dce97e9a2826
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:25:31 +0000 (9 02:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:25:31 +0000 (9 02:25 +0200)
tree04c499f714de16db8060518d34fa1267bf00376d
parentcfbdf4d2a0902c88b72ebdf9bb86760104cbfd62
parentb795853f5b9efec1afbffaa46ca1f19fb20dbf16
Merge branch 'w14_MDL-38753_m24_ocicount' of git://github.com/skodak/moodle into MOODLE_24_STABLE