Merge branch 'MDL-32359' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Apr 2012 22:16:28 +0000 (00:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Apr 2012 22:16:28 +0000 (00:16 +0200)
commitbf8086623db17739fb33e654c8060ff230a4ab76
treef0ac0de0dc4e7c7606cd856ad2629bf4b15035a6
parent74c7692265e7f6f163841da4bde9da4e336f5ede
parentf9e41d206dcc6f562663cabd771ed6e0022ffa9e
Merge branch 'MDL-32359' of git://github.com/timhunt/moodle