Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak...
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Nov 2011 20:41:38 +0000 (09:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Nov 2011 20:41:38 +0000 (09:41 +1300)

Trivial merge