Merge branch 'MDL-40673_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:03:45 +0000 (09:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:03:45 +0000 (09:03 +1200)

Trivial merge