Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:16:29 +0000 (20:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:16:29 +0000 (20:16 +0100)
commit5f2d7b30092b7480b097a3eafe4b3797a24701ff
treee8153a336daacc34cf91a3eb2abf40c731b23096
parent09ebf8386a6238d7b36a0741556f56125768a469
parent6fc65ae5c324250e88bb7132a8b635d70eb55f73
Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE