Git commits in Moodle 2.7.4 by Tim Price

commit 297a18d3e91770b5c9abd4cfe7b68744e1de5da8
Author: Tim Price <timprice@catalyst-au.net>
Date:   Tue, 16 Dec 2014 08:45:10 +0800
Tag:    v2.7.4

MDL-48421 navigation: accounting for potential regression


commit 3a20c85849b145dd8c12b9efb26a519c422e1b7f
Author: Tim Price <timprice@catalyst-au.net>
Date:   Mon, 01 Dec 2014 07:44:49 +0800
Tag:    v2.7.4

MDL-48421 navigation: correctly load child categories if parent is loaded