Merge branch 'MDL-40816_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:18:52 +0000 (18:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:18:52 +0000 (18:18 +0200)
commit79143f1e597531fc00de6b3b653bb0df51c5562e
tree400fc59f54af76d94ed70bb5d2bee11e6a33b8e0
parent30a209ba1762c33f1719bbe2d96bcc4e3629115a
parent888e317f2dcf014dbfca9393257f94addae86d97
Merge branch 'MDL-40816_master' of git://github.com/markn86/moodle