Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 14:34:31 +0000 (15:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 14:34:31 +0000 (15:34 +0100)
commit9cd8e48ca671b3da34d4d881411f91fd687799b6
tree74caecf5c5c95717acf0cab01556642d80d1eb1f
parentd03a13045519ed1ba4af379866affe1e4943ad86
parentdacbb3601152c82cf720732f390243534caf427f
Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle