Merge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:47:51 +0000 (02:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:47:51 +0000 (02:47 +0200)
commitdba85495c11f0a2c2b6033a535b4fa9db0e2f556
tree27b478d0d7a92ed559945fc6afa008588a9da25c
parent552f00fb8621c077457b2cada154e1a0db6402c5
parent7925d3ff1026dbac07f38633278820ee836aa3e0
Merge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle