Merge branch 'wip-MDL-35885-stable23' of git://github.com/phalacee/moodle into MOODLE...
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 00:39:43 +0000 (13:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 00:39:43 +0000 (13:39 +1300)

Trivial merge