Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 11:25:31 +0000 (13:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 11:25:31 +0000 (13:25 +0200)
commitd4a5896f8a21ddf7717bf99321fd0128b862046c
treeb4332d6651487ad9df0c39a2c67ff5e95b538d6f
parent68adfee6d453603f0e08b1fabeeba5f69df8a434
parent424f56fc9011dcc74b98619dfadcb15a60a07fa7
Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle