Merge branch 'wip-MDL-38347-stable23' of git://github.com/phalacee/moodle into MOODLE...
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Jun 2013 23:20:27 +0000 (11:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Jun 2013 23:20:27 +0000 (11:20 +1200)

Trivial merge