Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 23:48:04 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 23:48:04 +0000 (00:48 +0100)
commit427ad4d3c3abb713b43554058fc3d3410dd88bbe
tree3cc1a58063b4190cbe3a0dee117897615fd5e731
parente233175df15fc55042f3683805d8f4600e1c3631
parent901d58dfd358cc58939cb28da4930c8fba0ddcb1
Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle