Merge branch 'MDL-51205_pix_style' of git://github.com/andyjdavis/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 05:31:06 +0000 (13:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 05:31:06 +0000 (13:31 +0800)

Trivial merge