Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:00:34 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:00:34 +0000 (20:00 +0200)
commita2027b873b75a16ae04b07ca35c16050e715dbfa
tree839cf1e556271a2105ebc86bd22fe74af2fd6923
parentc1fc4ba397c38fa0941cb4b2cc04c9d35bc59227
parentf61abd1f683ccf957691fbbd38a4f1f8ce6b0a97
Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle