Merge branch 'MDL-36090_log2_23' of git://github.com/andyjdavis/moodle into MOODLE_23...
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 00:30:24 +0000 (12:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 00:30:24 +0000 (12:30 +1200)

Trivial merge