Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 09:47:59 +0000 (19:47 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 09:47:59 +0000 (19:47 +1000)

Trivial merge