Merge branch 'MDL-30031-22' of git://github.com/bostelm/moodle into MOODLE_22_STABLE
commitf36884dde739f38b7c2e59f14cd57f8fc4e24358
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:31 +0000 (9 02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:31 +0000 (9 02:14 +0100)
tree2ea2d61d099dab8059e249d1522bcf4b6c08f28d
parent5dff4c565fe598358f640e127639bec88148377a
parentfb93cfac00e36718b88340801fa28d86d2acf344
Merge branch 'MDL-30031-22' of git://github.com/bostelm/moodle into MOODLE_22_STABLE