Merge branch 'MDL-38647' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:22:25 +0000 (23:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:22:25 +0000 (23:22 +0100)
commitd89eed6fcac2b35b96b28249326ca0d73fe46b24
tree6fa0762e2dcd375a4e26a5c266178c623e16d5e8
parent45679e3a9ec067a4a345a2301650aa986ceecdfe
parent2515be0e8035bb1473da93ebaab645cb79a34110
Merge branch 'MDL-38647' of git://github.com/timhunt/moodle