Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 20:41:36 +0000 (21:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 20:41:36 +0000 (21:41 +0100)
commite233175df15fc55042f3683805d8f4600e1c3631
treed358b91a4936472bf60bcdafa2bdc5d68fa9a64d
parentf1662409a0dd395717ffc0ea891bea38908ca6e2
parent8c335cffc4f8f8519afb037266725529ded6165e
Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle