Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:25:12 +0000 (02:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:25:12 +0000 (02:25 +0200)

Trivial merge