Merge branch 'w19_MDL-32775_m23_searchpix' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 May 2012 02:22:48 +0000 (10:22 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 May 2012 02:22:48 +0000 (10:22 +0800)

Trivial merge