Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:51:47 +0000 (12:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:51:47 +0000 (12:51 +0100)
commite6307294434120b2093678a7373a818998f38a95
tree7939fcc81494ce2d9b40a86be35db8c4246e5f63
parent09fe13d1235deef2e0526e1217b16952fa43570a
parentbabf34d5cfc7845e8f42b850a39646bf9a9c17c3
Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle