Merge branch 'MDL-38849' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 22:52:27 +0000 (00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 22:52:27 +0000 (00:52 +0200)
commit5df002ad6874487075f440af843aca9604b0d16f
tree6fe42c68eff73ea93babd6f8cf5be7d3260c8d11
parent5a0443cc14d75dd71270d9d013c96f7166e0910d
parentc4dbaf74e8b247b6c063e78b378ff69d625a782d
Merge branch 'MDL-38849' of git://github.com/timhunt/moodle