Merge branch 'MDL-31386-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Feb 2012 02:14:58 +0000 (03:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Feb 2012 02:14:58 +0000 (03:14 +0100)
commit746aa0ba162302e71133ba3a09fc5df540f27ad2
treef5f66bd46bb6af62226da93e9698c6beb21bf1c7
parent1ddb08084bb2231c23aaeb3f9cc66a239eef67ed
parenta731d18ce51dd392ca0738420a5f55bb96fbb192
Merge branch 'MDL-31386-master-1' of git://git.luns.net.uk/moodle