Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 22:25:34 +0000 (23:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 22:25:34 +0000 (23:25 +0100)
commitc68f339e5ee4f071ccc5f10eb0a2534795c555b5
tree264015283ac6607dc50227fde381a32f171e6a12
parentac4c7aed68cbe70a53f3c865483548868ce6c82c
parent864b7c01308a080553f52bcf935d66213b2d062c
Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle