Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:19:15 +0000 (02:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:19:15 +0000 (02:19 +0200)
commit5b77684af7bc18303c189f2f11c98e2ff13c4a22
tree56bf13585185488a6efa9f26e7249b63a72272c2
parentdfef3028ae05d9ff25420b3afa5f93e7070f2341
parentc5b7c9357f6879cbf8fdfb89469ca5e3d1f76724
Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle