Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 21:54:32 +0000 (23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 21:54:32 +0000 (23:54 +0200)
commitadecb9de9a13088da6754d00b63228584cf163cf
tree6f6a597b340c086506059ab75274763aac64c2da
parent9867711fd758618f1f96e2dc39c2016d765b7324
parentd38a4849b79952aca80d22f7d80bae0ca8939ef4
Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle