Merge branch 'MDL-28512' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:02:12 +0000 (01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:02:12 +0000 (01:02 +0100)
commit29a4621e47dc8523620a9d70d4a34d988990c5d4
treecde97b0df77e33eee0f24911c65e025c85188e90
parent6501e6e0374a1cf036b023294dc1a5506f6934e0
parentfbfa572d706bfd9d04e79c7f34937244cf3ee3cd
Merge branch 'MDL-28512' of git://github.com/timhunt/moodle