Merge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23...
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 20:34:52 +0000 (09:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 20:34:52 +0000 (09:34 +1300)

Trivial merge