Merge branch 'MDL-27868' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Jun 2011 14:45:30 +0000 (16:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Jun 2011 14:45:30 +0000 (16:45 +0200)
commit3c158ff95e494a6b63cf40175e1fe3f801b9a2ea
tree6e2b22944af703863b8307b9ff866fbb83168727
parentff30976ad542d3b8be8a1111546f6a4dfdf81d32
parent5cf69d7ff51298c3d8964e917c08c13584bce587
Merge branch 'MDL-27868' of git://github.com/timhunt/moodle