Merge branch 'MDL-37539-master' of github.com:damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:05:54 +0000 (01:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:05:54 +0000 (01:05 +0100)
commit17f394f81a8990471a835ecae941c38194e797bf
treede1a33bb58d22c7d570f95eb84f5f1e0d6efefa6
parent29a4621e47dc8523620a9d70d4a34d988990c5d4
parent5389dfb0eb893004b47afcddb7bb748a790f0040
Merge branch 'MDL-37539-master' of github.com:damyon/moodle