Merge branch 'w52_MDL-30926_m23_blogassoc' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 23:38:51 +0000 (12:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 23:38:51 +0000 (12:38 +1300)

Trivial merge