Merge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Dec 2012 08:48:13 +0000 (09:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Dec 2012 08:48:13 +0000 (09:48 +0100)
commite9dab879b647fb034358948fe17cc9164ab692ad
tree5c709a08719442338fd1a8a40dd478aeac1e206d
parent552160e84484056aed61bc06a44b7cbcaf7f4390
parent50d6ad844acc29d5ae4c2ef8c8e9b536f656ccec
Merge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle