Merge branch 'wip-MDL-26500-21' of git://github.com/danpoltawski/moodle into MOODLE_2...
commitc168d35af5af8c43c0db647eed8dd2142a870769
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 22:04:51 +0000 (24 00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 22:04:51 +0000 (24 00:04 +0200)
tree946ccc11523ef1e517e8e79b85b0b7cb3dd84030
parent030fc2d27c0e659b886a24bc4ceffd5af778a1b5
parent0fcd56e671c2ba85dea8440f53718f70b3e1071c
Merge branch 'wip-MDL-26500-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE