Merge branch 'MDL-26861' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 19:59:32 +0000 (20:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 19:59:32 +0000 (20:59 +0100)
commit1595b8120fdc459c15b0c217d465e582e73312ec
treeca03ea71be9401e882f761898662c0c82ac0cfce
parent4c2ce98b42fc4975ba93f844da5e93beeace7b21
parent8c448e1c83c8a7671a7cbffb533ac3d3b4885f00
Merge branch 'MDL-26861' of git://github.com/timhunt/moodle