Merge branch '45457-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 21:54:36 +0000 (23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 21:54:36 +0000 (23:54 +0200)
commit9c1bbddce750a757af32ae221fd12fbc92f38ffa
treef8a8444c25dfe9ec5cc5060e71bbbc91efc0a8a7
parent1cf1ef9fe62f4cbb4c7b43439f2d000034b72b6d
parent1c17e19a5cb9d5943c02fe8cedc228467f6e1ca2
Merge branch '45457-27' of git://github.com/samhemelryk/moodle