Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:49:29 +0000 (09:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:49:29 +0000 (09:49 +1200)
commit4b005d875156eef8f783a0dddbd177f44e739407
tree24395d0bc565458a4e57a8c666a4c7dcc13b8ce6
parent1f6181e5aa656223d9aee94594cfc9db32389a23
parent9ac392547756922a955ad6572a6f7baf27deb3a0
Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle