Merge branch 'MDL-29216' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 20:52:55 +0000 (22:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 20:52:55 +0000 (22:52 +0200)
commit38697ad4aaa0aec6b4e091867876a331742620d7
treeb5484021416565a98d76a9e6c6edf7cf568ab828
parent92c9bc61279e10dc170641b8e534a99cc8ecf212
parenta44995325edcb7c22aa44a452c477f09fb09a869
Merge branch 'MDL-29216' of git://github.com/timhunt/moodle