Merge branch '42302-26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 22:39:46 +0000 (00:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 22:39:46 +0000 (00:39 +0200)
commite60637052c6f4c7a945473812b9321c62d6eb73e
tree5f73d93f6bb4cebcd50c8f5aa10d18afa5eb5d98
parent2c94d858f06eda8740129d6a6f1a387ad2be260d
parentb155a1703473c47ef4c2568c2b88ff17cc1b80bf
Merge branch '42302-26' of git://github.com/samhemelryk/moodle