Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 01:17:08 +0000 (03:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 01:17:08 +0000 (03:17 +0200)
commit636376947c04ef154fe29a616f45d3a33799cfeb
tree8121b0b2c796045212a59c13d96abad01514f80a
parenta2f667472e18d3e8da5f4a89b58abf24dd0cb4be
parent37836c19fb19f1213e2922806eb7fda110badfdc
Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle