Merge branch 'MDL-45449-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 17:58:52 +0000 (19:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 17:58:52 +0000 (19:58 +0200)
commit1cf1ef9fe62f4cbb4c7b43439f2d000034b72b6d
treed5ed276c35b5c826b36a659318991f0b49fcbf30
parent83b25b12ff4bf7a9de0d8e97fa939164c7f31362
parentc545f3b0db1a76fd3b0f5df4fecc99243cbdc9b7
Merge branch 'MDL-45449-master' of https://github.com/sammarshallou/moodle