Merge branch 'wip-MDL-29086-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle...
commit26158557130f602ef49560bc5c6f17369d30de31
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 23:48:22 +0000 (8 00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 23:48:22 +0000 (8 00:48 +0100)
treec629c4803f14607be87f959d8656c14895796651
parentc904abc752eda4093d235c6732491157b8770273
parentd1deac2d80ae9a4a7a4bfb2c79b7a5b8bf9b4a38
Merge branch 'wip-MDL-29086-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE