Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:24:17 +0000 (20:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:24:17 +0000 (20:24 +0200)
commit6bb78aedee65dd8467be140b308ec57bf0310d2b
tree3adc8bf7d40e4c1c8e7493adbc1e521ccbd05e53
parentd06700cbd6fdbaad3b3b90c1de1ace6a4b497243
parente613fd905b5b687f5bc7526762ce9d3c067029de
Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle