Merge branch 'MDL-27314' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:45:15 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:45:15 +0000 (00:45 +0100)
commit01783c46d47697b527a3cca86013e5ee44c76557
tree99151ad4abffbe01422b487a3884661cb9cfc6b8
parent073b19a2813ce489d2004d0e717565caf13d2f1c
parent21beddafa89ed6943483630d49689b4090dfa962
Merge branch 'MDL-27314' of git://github.com/timhunt/moodle