Merge branch 'MDL-49643-master-local-nav' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:28:08 +0000 (14:28 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:28:08 +0000 (14:28 +0100)

Trivial merge