Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:18:54 +0000 (02:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:18:54 +0000 (02:18 +0200)
commitbd032a64f94e60066c677cd3f6cfa3831b031e62
tree2195dd07ea1eff69b18945f1543c7d57bb432995
parent3ed2a4b2ccac8aa2e168cc1199a3f13d09989794
parentdc8a848c7d50ed3da467ce46a1829a7fcf066a2a
Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle