Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 21:57:55 +0000 (23:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 21:57:55 +0000 (23:57 +0200)
commitfcb36b65ec39d8737da6b49915c076a399fd29e6
tree857b38453fc4c0ba7137bc716365d606ea98abd0
parentadecb9de9a13088da6754d00b63228584cf163cf
parent7313ac6c7af62bf86ca8c101e96aedc72873312e
Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle