Merge branch 'MDL-29080_export_hidden2' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 21:47:12 +0000 (10:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 21:47:12 +0000 (10:47 +1300)

Trivial merge