Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 22:33:22 +0000 (23:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 22:33:22 +0000 (23:33 +0100)
commit857b40256e747b8cfc897c0d9e7c476958c3cb3e
tree7c32050ee9a14042a533a1a61feb41bbce3f8040
parentc6cbc3c70c27f910e77d39ac00b62274a095026b
parentc6dcce6ad330d446f80ce99157a8955ecbd9c635
Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle