Merge branch 'MDL-33681' of git://github.com/timhunt/moodle
commitdbe4bcc959d0a4cdea29554ce0f5647f148aa238
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:06:26 +0000 (13 00:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:06:26 +0000 (13 00:06 +0200)
treeb6b63e78664cbe7c5219504f3c652c868953abab
parent039e1105099f08e795b3193f13c070ad7fc370c6
parentbb410a1eccc40a6ad902b7170ff4e143de8edda3
Merge branch 'MDL-33681' of git://github.com/timhunt/moodle