Merge branch 'wip-MDL-35056-stable23' of git://github.com/phalacee/moodle into MOODLE...
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 20:56:58 +0000 (09:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 20:56:58 +0000 (09:56 +1300)

Trivial merge