Merge branch 'MDL-45443-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:52:54 +0000 (12:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:52:54 +0000 (12:52 +0200)
commitb8622d1632a48f8bec1773625b3586ce5f8535d1
tree13cda091fe611ecdab1e45ba1ab81b194cdeafca
parent6280e88d69c6db80eaee7b823be3a88bb7cb9b81
parenta36f8b36dd412572868b01447919e1142e19cd73
Merge branch 'MDL-45443-master' of git://github.com/FMCorz/moodle