Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 16 Apr 2015 09:04:34 +0000 (17:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 16 Apr 2015 09:04:34 +0000 (17:04 +0800)
commit89a6290fb9e19b11370aa0f198a7560ee3f9dc21
tree0621849d3b562bdd1aac882a307f33d89bdc2684
parent960c0ec40579bb8116feb107e4e192b7116ec801
parent80cb20afe5d4b95166f9e2ce313d636f20831c52
Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle