Merge branch 'MDL-40604-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:22:15 +0000 (00:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:22:15 +0000 (00:22 +0200)
commit660ee07b60a305602d7e212eae83935c417d6945
tree4f6c1b838f07fa4af2434387ab3baaad514f3f08
parent3742ee163b3c90e73abe389cf634f71095e91863
parentac1125237524d34fe3c9d2452f36bc80b623a458
Merge branch 'MDL-40604-master' of git://github.com/danpoltawski/moodle